diff --git a/Documentation/quick-start-oss.md b/Documentation/quick-start-oss.md
index 38903c0341d36ff57f6cec4cd63f7e74dcdbad86..87f3f57433fbabb50e4c479a89c5f90dc757ed43 100644
--- a/Documentation/quick-start-oss.md
+++ b/Documentation/quick-start-oss.md
@@ -76,7 +76,7 @@ Steps for getting a demo to run on a local Linux Helm environment and a local Ki
 
   ```bash
   make chart
-  helm install qostest --namespace=controllers-system --create-namespace tmp/helm
+  helm install qostest --namespace=codeco-swm-controllers --create-namespace tmp/helm
   ```
 
 - Show network topology/ network links (Custom Resources)
diff --git a/helm/qos-scheduler/charts/cni/templates/daemonset.yaml b/helm/qos-scheduler/charts/cni/templates/daemonset.yaml
index 94e14b7f8a04f228784cbc3f8060b4c3d2a0ae9a..d99a18971e6fc5ce6421aa89e60bf65932fb0821 100644
--- a/helm/qos-scheduler/charts/cni/templates/daemonset.yaml
+++ b/helm/qos-scheduler/charts/cni/templates/daemonset.yaml
@@ -53,6 +53,7 @@ spec:
           args: ["cd /host/opt/cni/bin && wget https://github.com/containernetworking/plugins/releases/download/v1.0.1/cni-plugins-linux-amd64-v1.0.1.tgz -O cni-plugins-linux-amd64-v1.0.1.tgz && tar xzf cni-plugins-linux-amd64-v1.0.1.tgz"]
           securityContext:
             privileged: true
+            runAsUser: 0
           volumeMounts:
             - name: cnibin
               mountPath: /host/opt/cni/bin
diff --git a/helm/qos-scheduler/charts/controller/values.yaml b/helm/qos-scheduler/charts/controller/values.yaml
index dd385e61126cf69c4a1b5a3e49fbf0323c6b3b7e..5b9449596a38f8ab86783a7bf329235d5f91ad4f 100644
--- a/helm/qos-scheduler/charts/controller/values.yaml
+++ b/helm/qos-scheduler/charts/controller/values.yaml
@@ -7,7 +7,7 @@ global:
       tag: latest
       pullSecrets: []
       credentials: {}
-   qosNamespace: controllers-system
+   qosNamespace: codeco-swm-controllers
 
 # Default values for controller.
 serviceAccount:
diff --git a/helm/qos-scheduler/charts/network/templates/_helpers.tpl b/helm/qos-scheduler/charts/network/templates/_helpers.tpl
index 11c79f0bc650cecc6f7186e81d957766a609b51d..2a76695b06a211a23f5b333cbab0417f4c7f22c4 100644
--- a/helm/qos-scheduler/charts/network/templates/_helpers.tpl
+++ b/helm/qos-scheduler/charts/network/templates/_helpers.tpl
@@ -3,7 +3,7 @@
 
 
 {{- define "namespace" -}}
-{{ cat "network-" . "-namespace" | lower | nospace }}
+{{ cat "codeco-nw-" . "-ns" | lower | nospace }}
 {{- end }}
 
 {{- define "role" -}}
diff --git a/helm/qos-scheduler/charts/optimizer/values.yaml b/helm/qos-scheduler/charts/optimizer/values.yaml
index 29ab0726652f7fe35ee90385c9acaf45eb45a97d..a88a1f04db3f9e72611b01389af55f7353fd7f88 100644
--- a/helm/qos-scheduler/charts/optimizer/values.yaml
+++ b/helm/qos-scheduler/charts/optimizer/values.yaml
@@ -9,7 +9,7 @@ global:
       tag: latest
       pullSecrets: []
       credentials: {}
-   qosNamespace: controllers-system
+   qosNamespace: codeco-swm-controllers
 
 serviceAccount:
    create: true
diff --git a/helm/qos-scheduler/charts/solver/values.yaml b/helm/qos-scheduler/charts/solver/values.yaml
index 456ec92bd3fb57e0cb049780549e5fe9c48b4f2a..042332f59a8975fc03b0fa4f98b13f4d3efb512d 100644
--- a/helm/qos-scheduler/charts/solver/values.yaml
+++ b/helm/qos-scheduler/charts/solver/values.yaml
@@ -7,7 +7,7 @@ global:
       tag: latest
       pullSecrets: []
       credentials: {}
-   qosNamespace: controllers-system
+   qosNamespace: codeco-swm-controllers
 
 # Default values for solver.
 
diff --git a/helm/qos-scheduler/values.yaml b/helm/qos-scheduler/values.yaml
index a153157b5f2166f52619f07c64deee4701eb9a56..9bfd71226ea2bfee37931bb4c396a3fd50966f8a 100644
--- a/helm/qos-scheduler/values.yaml
+++ b/helm/qos-scheduler/values.yaml
@@ -6,7 +6,7 @@
 # Declare variables to be passed into your templates.
 
 global:
-   qosNamespace: controllers-system
+   qosNamespace: codeco-swm-controllers
    network:
    image:
       repositoryPrefix: hecodeco/swm-
@@ -56,4 +56,4 @@ solver:
 nsconfig:
    namespaces:
     - kube-system
-    - controllers-system
+    - codeco-swm-controllers
diff --git a/start_cluster.sh b/start_cluster.sh
index c18ec509822063ca56a3af7b9035e547091c61c9..c29d5823871b271821bccfb0b18476cf948a0021 100755
--- a/start_cluster.sh
+++ b/start_cluster.sh
@@ -11,7 +11,7 @@ set -euo pipefail
 
 # This is the path from where this is being called from to where the script lives.
 SCRIPTHOME=$(dirname $(realpath "$0"))
-SED=${SED:-"gsed"}
+# SED=${SED:-"gsed"}
 DOCKERCONFIGJSON=${DOCKERCONFIGJSON:-"$HOME/.docker/config.json"}
 
 # When you set this, make sure you've compiled the code for a compatible
@@ -22,7 +22,8 @@ NODEK8SVERSION=${NODEK8SVERSION:-v1.23.1}
 
 CONFIGDIR="demo"
 
-$SED --follow-symlinks -i "s/image: kindest\/node:v[[:digit:]]\+.[[:digit:]]\+.[[:digit:]]\+/image: kindest\/node:$NODEK8SVERSION/" $SCRIPTHOME/config/${CONFIGDIR}/cluster-config.yaml
+# $SED --follow-symlinks -i "s/image: kindest\/node:v[[:digit:]]\+.[[:digit:]]\+.[[:digit:]]\+/image: kindest\/node:$NODEK8SVERSION/" $SCRIPTHOME/config/${CONFIGDIR}/cluster-config.yaml
+sed --follow-symlinks -i "s/image: kindest\/node:v[[:digit:]]\+.[[:digit:]]\+.[[:digit:]]\+/image: kindest\/node:$NODEK8SVERSION/" $SCRIPTHOME/config/${CONFIGDIR}/cluster-config.yaml
 
 echo "creating ${CONFIGDIR} qos-scheduling cluster using Kubernetes version $NODEK8SVERSION"
 
@@ -40,5 +41,3 @@ for n in $NODES; do
   kubectl label --overwrite nodes $n $NODE_LABEL_PREFIX.$n=
 done
 
-kubectl label --overwrite node c1 $NODE_LABEL_PREFIX.restapidb=
-