diff --git a/.run/varadhi local [run].run.xml b/.run/varadhi local [run].run.xml
index 8874a634..e7947740 100644
--- a/.run/varadhi local [run].run.xml	
+++ b/.run/varadhi local [run].run.xml	
@@ -14,7 +14,7 @@
           <option value="--args=&quot;src/main/resources/configuration.yml&quot;" />
         </list>
       </option>
-      <option name="vmOptions" value="-Dcom.sun.management.jmxremote.rmi.port=19991 -Dcom.sun.management.jmxremote.port=19990 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dvertx.disableDnsResolver=true -Dlog4j2.configurationFile=src/main/resources/log4j2.xml" />
+      <option name="vmOptions" value="-Dvertx.disableDnsResolver=true -Dlog4j2.configurationFile=src/main/resources/log4j2.xml" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
@@ -22,4 +22,4 @@
     <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/README.md b/README.md
index 069cd2fc..5d86f57b 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Start [varadhi local \[run\]](.run%2Fvaradhi%20local%20%5Brun%5D.run.xml) Intell
 
 ## k8s Deployment
 
-```helm install varadhi setup/helm/varadhi -f setup/helm/varadhi/fcp.values.yaml```
+```helm install varadhi-server setup/helm/varadhi -f setup/helm/varadhi/values/server_values.yaml```
 ```helm install varadhi-controller setup/helm/varadhi -f setup/helm/varadhi/values/controller_values.yaml```
 
 ## Modules
diff --git a/setup/helm/test/service-server.yaml b/setup/helm/test/service-server.yaml
deleted file mode 100644
index 202263d2..00000000
--- a/setup/helm/test/service-server.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: varadhi-server-headless
-  namespace: default
-  labels:
-    app: varadhi
-    component: server
-    release: varadhi-server
-spec:
-  ports:
-    - port: 18488
-      targetPort: 8888
-      protocol: TCP
-      name: server-http
-    - port: 5005
-      targetPort: 5005
-      protocol: TCP
-      name: jvm-debug
-  selector:
-    app: varadhi
-    component: server
-    release: varadhi-server
-  clusterIP: None
-  publishNotReadyAddresses: true
diff --git a/setup/helm/varadhi/templates/_server.tpl b/setup/helm/varadhi/templates/_app.tpl
similarity index 97%
rename from setup/helm/varadhi/templates/_server.tpl
rename to setup/helm/varadhi/templates/_app.tpl
index 915c501f..5e84d42f 100644
--- a/setup/helm/varadhi/templates/_server.tpl
+++ b/setup/helm/varadhi/templates/_app.tpl
@@ -1,7 +1,7 @@
 {{/*
 Varadhi Server configuration.
 */}}
-{{- define "configMap.varadhi.server" -}}
+{{- define "configMap.varadhi.app" -}}
 
 {{ with .Values.varadhi.app.member }}
 member:
diff --git a/setup/helm/varadhi/templates/app-configmap.yaml b/setup/helm/varadhi/templates/app-configmap.yaml
index c6c0e237..1af9cbf3 100644
--- a/setup/helm/varadhi/templates/app-configmap.yaml
+++ b/setup/helm/varadhi/templates/app-configmap.yaml
@@ -12,6 +12,4 @@ metadata:
     component: {{ .Values.deployment.name }}
 data:
   configuration.yml: |
-    {{- if or (eq .Values.deployment.name "server") (eq .Values.deployment.name "controller") (eq .Values.deployment.name "consumer") }}
-    {{ include "configMap.varadhi.server" . | nindent 4 }}
-    {{- end }}
+    {{ include "configMap.varadhi.app" . | nindent 4 }}
diff --git a/setup/helm/varadhi/templates/deployment.yaml b/setup/helm/varadhi/templates/deployment.yaml
index c33a8c16..af516ba5 100644
--- a/setup/helm/varadhi/templates/deployment.yaml
+++ b/setup/helm/varadhi/templates/deployment.yaml
@@ -67,10 +67,10 @@ spec:
                 fieldRef:
                   fieldPath: metadata.name
           ports:
-            - containerPort: 9990 # jmx remote port
+            - containerPort: {{ .Values.varadhi.app.ports.jmx }} # jmx remote port
               name: jmx
           {{- if .Values.varadhi.app.debug }}
-            - containerPort: 5005 # jvm remote Debug port
+            - containerPort: {{ .Values.varadhi.app.ports.jvmDebug }} # jvm remote Debug port
               name: jvm-debug
           {{- end }}
           volumeMounts:
diff --git a/setup/helm/varadhi/templates/server-service.yaml b/setup/helm/varadhi/templates/server-service.yaml
index d81c3153..0a4e34e6 100644
--- a/setup/helm/varadhi/templates/server-service.yaml
+++ b/setup/helm/varadhi/templates/server-service.yaml
@@ -23,8 +23,8 @@ spec:
       protocol: TCP
       name: server-http
     {{- if .Values.varadhi.app.debug }}
-    - port: 5005
-      targetPort: 5005
+    - port: {{ .Values.varadhi.app.ports.jvmDebug }}
+      targetPort: {{ .Values.varadhi.app.ports.jvmDebug }}
       protocol: TCP
       name: jvm-debug
       {{- end }}
diff --git a/setup/helm/varadhi/values.yaml b/setup/helm/varadhi/values.yaml
index 82e6d548..20298f76 100644
--- a/setup/helm/varadhi/values.yaml
+++ b/setup/helm/varadhi/values.yaml
@@ -195,6 +195,9 @@ varadhi:
       roles: [ "Server", "Controller" ]
       cpuCount: 1
       nicMBps: 100
+    ports:
+      jmx: 9990
+      jvmDebug: 5005
 
 #############################################
 # Varadhi Server logging config