diff --git a/deployments/custom-installation/config/account.yaml b/deployments/custom-installation/config/account.yaml
index 2af8ec50ab827474b33951a784a9e36a5cb41373..e4a9bd72470586e3dc0cea54f88e1585b1ffb94b 100644
--- a/deployments/custom-installation/config/account.yaml
+++ b/deployments/custom-installation/config/account.yaml
@@ -2,3 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: l2sm-operator
+  namespace: he-codeco-netma
diff --git a/deployments/custom-installation/config/binding.yaml b/deployments/custom-installation/config/binding.yaml
index 01997ea9bbe7d51f0a16c125ad53d6e5b9ec2a93..0264b913fca099d386b232d78ab66823fdf70fa2 100644
--- a/deployments/custom-installation/config/binding.yaml
+++ b/deployments/custom-installation/config/binding.yaml
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: l2sm-operator
+  namespace: he-codeco-netma
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/deployments/custom-installation/deployController.yaml b/deployments/custom-installation/deployController.yaml
index 614ec960730428b23db36497624e0ead239e7088..8c3a780a2ab9d9bf4c163ca464504a04a1711541 100644
--- a/deployments/custom-installation/deployController.yaml
+++ b/deployments/custom-installation/deployController.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: l2sm-controller
+  namespace: he-codeco-netma
 spec:
   replicas: 1
   selector:
@@ -30,6 +31,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: l2sm-controller-service
+  namespace: he-codeco-netma
 spec:
   selector:
     app: l2sm-controller
diff --git a/deployments/custom-installation/deployManager.yaml b/deployments/custom-installation/deployManager.yaml
index 86da97a5deba654232963226dfc951969e7031f3..1dee7721c7361a23f895887e466f097e160f24ad 100644
--- a/deployments/custom-installation/deployManager.yaml
+++ b/deployments/custom-installation/deployManager.yaml
@@ -9666,7 +9666,7 @@ spec:
         - /manager
         env:
         - name: CONTROLLER_IP
-          value: l2sm-controller-service.default.svc.cluster.local
+          value: l2sm-controller-service.he-codeco-netma.svc.cluster.local
         - name: CONTROLLER_PORT
           value: "8181"
         - name: SWITCHES_NAMESPACE
diff --git a/deployments/custom-installation/deployOperator.yaml b/deployments/custom-installation/deployOperator.yaml
index 418305d32425fcc6467084deef9b3ad6f327131d..ca07047c0901817677c42514ed225449f27e24bd 100644
--- a/deployments/custom-installation/deployOperator.yaml
+++ b/deployments/custom-installation/deployOperator.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: l2sm-operator
+  namespace: he-codeco-netma
 spec:
   replicas: 1
   strategy:
@@ -34,7 +35,7 @@ spec:
           - name: CONTROLLER_IP
             value: l2sm-controller-service
           - name: DATABASE_IP
-            value: mysql-development-service
+            value: mysql-service
           - name: MYSQL_USER
             value: l2sm
           - name: MYSQL_PASSWORD
@@ -43,7 +44,7 @@ spec:
             value: l2sm
         # imagePullPolicy: Always
       nodeSelector:
-        dedicated: master
+        dedicated: control-plane
       tolerations:
       - key: dedicated
         operator: Equal
@@ -55,6 +56,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: l2sm-operator-service
+  namespace: he-codeco-netma
 spec:
   ports:
     - protocol: TCP
diff --git a/deployments/custom-installation/deploySwitch.yaml b/deployments/custom-installation/deploySwitch.yaml
index 590637178e45237adadd6a8f859a731d43838055..e0bad8514fdf6754626ec2f11e215165e2f67ba0 100644
--- a/deployments/custom-installation/deploySwitch.yaml
+++ b/deployments/custom-installation/deploySwitch.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: l2sm-switch
-  #namespace: kube-system
+  namespace: he-codeco-netma
   labels:
     l2sm-component: l2sm-switch
 spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost1.yaml b/deployments/custom-installation/interfaces_definitions/vhost1.yaml
index 35ec50b0ac7c00c5baa36be96599a779af1424e6..408b065e4b94b55e30dd2dcf06238303867d3ddd 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost1.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost1.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth1
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost10.yaml b/deployments/custom-installation/interfaces_definitions/vhost10.yaml
index 4937c129f16f1cc33e6cdbb7aaff0e2456757b92..73e4c26505c7d027b70fb7aa95557cf04f7f3465 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost10.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost10.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth10
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost2.yaml b/deployments/custom-installation/interfaces_definitions/vhost2.yaml
index cb536e681008834ae3b702b7f7c41470208129a8..8c7d0521956e440288bfecdaee83d53516eb0401 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost2.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost2.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth2
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost3.yaml b/deployments/custom-installation/interfaces_definitions/vhost3.yaml
index e9895a6da6c6da23e1c83e7d553793b0d642a0d6..47ae587aa9b766b1ec1b75ea4d5024285b20694e 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost3.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost3.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth3
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost4.yaml b/deployments/custom-installation/interfaces_definitions/vhost4.yaml
index c78bb1d57a718cd43507e1d455444f18d2813192..4ee5bce70dc8b062b6b78e5b3cef67e9930b6bdd 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost4.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost4.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth4
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost5.yaml b/deployments/custom-installation/interfaces_definitions/vhost5.yaml
index 624a4e0f005f9fc99d03d8d1c3823633f1799f09..131d2d658c0200d51a2162d72d2a5b607d766f34 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost5.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost5.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth5
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost6.yaml b/deployments/custom-installation/interfaces_definitions/vhost6.yaml
index 2de8c5a2023f3f20c63ab2ee72fd375e8f45fb7c..799d0ecdd70efe49b654feb7642967e74f71d940 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost6.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost6.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth6
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost7.yaml b/deployments/custom-installation/interfaces_definitions/vhost7.yaml
index f4d707ba5c6dd123b1fbb4552a79ba2aeec80074..69a680b45982409f821934e60bcce2bdee62a63f 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost7.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost7.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth7
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost8.yaml b/deployments/custom-installation/interfaces_definitions/vhost8.yaml
index 2369034c16798bf196874c31c28d6d59dc824bc2..978b50e0f259983c5efb42414a763db319ea7006 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost8.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost8.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth8
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost9.yaml b/deployments/custom-installation/interfaces_definitions/vhost9.yaml
index b2a6f9bd1b0d60bdc0b000e7d6eccf774e1f81f4..597aec704f178d1fe0f3c17a6ab6ecf2855c5ff6 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost9.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost9.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth9
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
diff --git a/deployments/custom-installation/mysql/database-schema.yaml b/deployments/custom-installation/mysql/database-schema.yaml
index 9acea17574391b05f04fec2b65dfa2d082669893..0c8f4c6c9f5500ccc60eb28e4825bef3b032ce16 100644
--- a/deployments/custom-installation/mysql/database-schema.yaml
+++ b/deployments/custom-installation/mysql/database-schema.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: mysql-schema
+  namespace: he-codeco-netma
 data:
   init.sql: |
   
diff --git a/deployments/custom-installation/mysql/mysql-development.yaml b/deployments/custom-installation/mysql/mysql-deployment.yaml
similarity index 89%
rename from deployments/custom-installation/mysql/mysql-development.yaml
rename to deployments/custom-installation/mysql/mysql-deployment.yaml
index 030042dcf072489878e36198e36f7e46974043ad..d14a2d2be4c2c480bc5995388ef9ef09b6278409 100644
--- a/deployments/custom-installation/mysql/mysql-development.yaml
+++ b/deployments/custom-installation/mysql/mysql-deployment.yaml
@@ -1,7 +1,8 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: mysql-development-pod
+  name: mysql-pod
+  namespace: he-codeco-netma
   labels:
     app: mysql
 spec:
@@ -33,7 +34,8 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: mysql-development-service
+  name: mysql-service
+  namespace: he-codeco-netma
 spec:
   type: ClusterIP
   ports:
@@ -47,6 +49,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: mysql-secret
+  namespace: he-codeco-netma
 type: Opaque
 data:
   MYSQL_ROOT_PASSWORD: cGFzc3dvcmQ=  # Base64 encoded "password"
diff --git a/deployments/custom-installation/mysql/mysql-pv.yaml b/deployments/custom-installation/mysql/mysql-pv.yaml
index 8eef7d15802a05f302ad37446d59065cea7438e1..ee8de6cf1e0cf8fae79803831d9cf503efea598e 100644
--- a/deployments/custom-installation/mysql/mysql-pv.yaml
+++ b/deployments/custom-installation/mysql/mysql-pv.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: mysql-pv
+  namespace: he-codeco-netma
   labels:
     type: local
 spec:
diff --git a/deployments/custom-installation/mysql/mysql-pvc.yaml b/deployments/custom-installation/mysql/mysql-pvc.yaml
index 889f6d5e7826aa40756b7065b3457313dac5edeb..481a3b27de831960e9875cdc281b43b717c603a5 100644
--- a/deployments/custom-installation/mysql/mysql-pvc.yaml
+++ b/deployments/custom-installation/mysql/mysql-pvc.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: mysql-pv-claim
+  namespace: he-codeco-netma
 spec:
   storageClassName: manual
   accessModes:
diff --git a/deployments/l2sm-deployment.yaml b/deployments/l2sm-deployment.yaml
index 762f0bd2d219ce64dc2739de5b77c82a277d60fe..a073b1e4e8fccc115b50a31c2551b65cb9e66cd2 100644
--- a/deployments/l2sm-deployment.yaml
+++ b/deployments/l2sm-deployment.yaml
@@ -1,12 +1,28 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    app.kubernetes.io/component: manager
+    app.kubernetes.io/created-by: l2network
+    app.kubernetes.io/instance: system
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: namespace
+    app.kubernetes.io/part-of: l2network
+    control-plane: controller-manager
+  name: he-codeco-netma
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: l2sm-operator
+  namespace: he-codeco-netma
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: l2sm-operator
+  namespace: he-codeco-netma
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -20,6 +36,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: l2sm-controller
+  namespace: he-codeco-netma
 spec:
   replicas: 1
   selector:
@@ -48,6 +65,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: l2sm-controller-service
+  namespace: he-codeco-netma
 spec:
   selector:
     app: l2sm-controller
@@ -63,20 +81,7 @@ spec:
   type: ClusterIP
 ---
 
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: l2network
-    app.kubernetes.io/instance: system
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/name: namespace
-    app.kubernetes.io/part-of: l2network
-    control-plane: controller-manager
-  name: he-codeco-netma
----
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -9730,7 +9735,7 @@ spec:
         - /manager
         env:
         - name: CONTROLLER_IP
-          value: l2sm-controller-service.default.svc.cluster.local
+          value: l2sm-controller-service.he-codeco-netma.svc.cluster.local
         - name: CONTROLLER_PORT
           value: "8181"
         - name: SWITCHES_NAMESPACE
@@ -9881,6 +9886,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: l2sm-operator
+  namespace: he-codeco-netma
 spec:
   replicas: 1
   strategy:
@@ -9913,7 +9919,7 @@ spec:
           - name: CONTROLLER_IP
             value: l2sm-controller-service
           - name: DATABASE_IP
-            value: mysql-development-service
+            value: mysql-service
           - name: MYSQL_USER
             value: l2sm
           - name: MYSQL_PASSWORD
@@ -9922,7 +9928,7 @@ spec:
             value: l2sm
         # imagePullPolicy: Always
       nodeSelector:
-        dedicated: master
+        dedicated: control-plane
       tolerations:
       - key: dedicated
         operator: Equal
@@ -9934,6 +9940,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: l2sm-operator-service
+  namespace: he-codeco-netma
 spec:
   ports:
     - protocol: TCP
@@ -9948,7 +9955,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: l2sm-switch
-  #namespace: kube-system
+  namespace: he-codeco-netma
   labels:
     l2sm-component: l2sm-switch
 spec:
@@ -10006,6 +10013,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth10
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
@@ -10025,6 +10033,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth1
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
@@ -10044,6 +10053,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth2
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
@@ -10063,6 +10073,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth3
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
@@ -10082,6 +10093,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth4
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
@@ -10101,6 +10113,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth5
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
@@ -10120,6 +10133,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth6
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
@@ -10139,6 +10153,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth7
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
@@ -10158,6 +10173,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth8
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
@@ -10177,6 +10193,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
   name: veth9
+  namespace: he-codeco-netma
   labels:
     app: l2sm
 spec:
@@ -10195,6 +10212,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: mysql-schema
+  namespace: he-codeco-netma
 data:
   init.sql: |
   
@@ -10256,7 +10274,8 @@ data:
 apiVersion: v1
 kind: Pod
 metadata:
-  name: mysql-development-pod
+  name: mysql-pod
+  namespace: he-codeco-netma
   labels:
     app: mysql
 spec:
@@ -10288,7 +10307,8 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: mysql-development-service
+  name: mysql-service
+  namespace: he-codeco-netma
 spec:
   type: ClusterIP
   ports:
@@ -10302,6 +10322,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: mysql-secret
+  namespace: he-codeco-netma
 type: Opaque
 data:
   MYSQL_ROOT_PASSWORD: cGFzc3dvcmQ=  # Base64 encoded "password"
@@ -10313,6 +10334,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: mysql-pv-claim
+  namespace: he-codeco-netma
 spec:
   storageClassName: manual
   accessModes:
@@ -10325,6 +10347,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: mysql-pv
+  namespace: he-codeco-netma
   labels:
     type: local
 spec: