diff --git a/netmaker/config.yaml b/netmaker/config.yaml
new file mode 100644
index 0000000..67395c1
--- /dev/null
+++ b/netmaker/config.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: netmaker-config 
+data:
+  SERVER_NAME: netmaker.infra.dubyatp.xyz
+  SERVER_API_CONN_STRING: api.netmaker.infra.dubyatp.xyz:443
+  SERVER_HTTP_HOST: api.netmaker.infra.dubyatp.xyz
+  API_PORT: "8081"
+  WG_QUICK_USERSPACE_IMPLEMENTATION: wireguard-go
+  DNS_MODE: "off"
+  DISPLAY_KEYS: "on"
+  DATABASE: postgres
+  SQL_HOST: "weyma-pgsql-rw.cloudnativepg.svc.cluster.local"
+  SQL_PORT: "5432"
+  SQL_DB: "netmaker"
+  SQL_USER: "netmaker"
+  MQ_USERNAME: netmaker
+  CORS_ALLOWED_ORIGIN: '*'
+  SERVER_BROKER_ENDPOINT: "ws://mq:1883"
+  BROKER_ENDPOINT: "wss://broker.netmaker.infra.dubyatp.xyz"
+  PLATFORM: "Kubernetes"
+  VERBOSITY: "3"
+  K8s: "true"
+  CACHING_ENABLED: "false"
\ No newline at end of file
diff --git a/netmaker/ingress.yaml b/netmaker/ingress.yaml
index 70d0101..4a24cc2 100644
--- a/netmaker/ingress.yaml
+++ b/netmaker/ingress.yaml
@@ -4,7 +4,7 @@ metadata:
   name: netmaker-api-ingress
 spec:
   rules:
-  - host: api.netmaker-test.infra.dubyatp.xyz
+  - host: api.netmaker.infra.dubyatp.xyz
     http:
       paths:
       - pathType: Prefix
diff --git a/netmaker/mosquitto/ingress.yaml b/netmaker/mosquitto/ingress.yaml
index 89fc642..3035e8d 100644
--- a/netmaker/mosquitto/ingress.yaml
+++ b/netmaker/mosquitto/ingress.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/name: mosquitto-ingress
 spec:
   rules:
-  - host: broker.netmaker-test.infra.dubyatp.xyz
+  - host: broker.netmaker.infra.dubyatp.xyz
     http:
       paths:
       - pathType: Prefix
diff --git a/netmaker/statefulset.yaml b/netmaker/statefulset.yaml
index 391936d..03f2aea 100644
--- a/netmaker/statefulset.yaml
+++ b/netmaker/statefulset.yaml
@@ -31,30 +31,6 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        - name: SERVER_NAME
-          value: broker.netmaker-test.infra.dubyatp.xyz
-        - name: SERVER_API_CONN_STRING
-          value: api.netmaker-test.infra.dubyatp.xyz:443
-        - name: SERVER_HTTP_HOST
-          value: api.netmaker-test.infra.dubyatp.xyz
-        - name: API_PORT
-          value: "8081"
-        - name: WG_QUICK_USERSPACE_IMPLEMENTATION
-          value: wireguard-go
-        - name: DNS_MODE
-          value: "off"
-        - name: DISPLAY_KEYS
-          value: "on"
-        - name: DATABASE
-          value: postgres
-        - name: SQL_HOST
-          value: "weyma-pgsql-rw.cloudnativepg.svc.cluster.local" 
-        - name: SQL_PORT
-          value: "5432"
-        - name: SQL_DB
-          value: "netmaker"
-        - name: SQL_USER
-          value: "netmaker"
         - name: SQL_PASS
           valueFrom:
             secretKeyRef:
@@ -65,23 +41,19 @@ spec:
             secretKeyRef:
               key: master_key
               name: netmaker-secrets
-        - name: MQ_USERNAME
-          value: netmaker
         - name: MQ_PASSWORD
           valueFrom:
             secretKeyRef:
               key: mq_password
               name: netmaker-secrets
-        - name: CORS_ALLOWED_ORIGIN
-          value: '*'
-        - name: SERVER_BROKER_ENDPOINT
-          value: "ws://mq:1883"
-        - name: BROKER_ENDPOINT
-          value: "wss://broker.netmaker-test.infra.dubyatp.xyz"
-        - name: PLATFORM
-          value: "Kubernetes"
-        - name: VERBOSITY
-          value: "3"
+        - name: TURN_SERVER_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: turn_password
+              name: netmaker-secrets
+        envFrom:
+          - configMapRef:
+              name: netmaker-config
         image: gravitl/netmaker:v1.1.0
         imagePullPolicy: Always
         name: netmaker
diff --git a/netmaker/ui/ingress.yaml b/netmaker/ui/ingress.yaml
index 72cff1b..74ed436 100644
--- a/netmaker/ui/ingress.yaml
+++ b/netmaker/ui/ingress.yaml
@@ -4,7 +4,7 @@ metadata:
   name: netmaker-ui-ingress
 spec:
   rules:
-  - host: dashboard.netmaker-test.infra.dubyatp.xyz
+  - host: dashboard.netmaker.infra.dubyatp.xyz
     http:
       paths:
       - pathType: Prefix