diff --git a/charts/appgate-server/templates/deployment.yaml b/charts/appgate-server/templates/deployment.yaml
index b004626..5eaca0d 100644
--- a/charts/appgate-server/templates/deployment.yaml
+++ b/charts/appgate-server/templates/deployment.yaml
@@ -35,16 +35,28 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          # command: ["poktrolld"]
-          # command: ["dlv"]
-          args: 
-            #- "exec"
-            #- "--listen=:40006"
-            #- "--headless=true"
-            #- "--api-version=2"
-            #- "--accept-multiclient"
-            #- "/usr/local/bin/poktrolld"
-            #- "--"
+{{ if .Values.development.delve.enabled }}
+          command: [ "/go/bin/dlv" ]
+          args:
+            - exec
+            - --listen={{ .Values.development.delve.laddr }}
+            - --headless=true
+            - --api-version=2
+            - --accept-multiclient
+            - /usr/local/bin/poktrolld
+            - --
+{{ else }}
+          # TODO(@okdas): enable health checks
+          # livenessProbe:
+          #   httpGet:
+          #     path: /
+          #     port: http
+          # readinessProbe:
+          #   httpGet:
+          #     path: /
+          #     port: http
+          args:
+{{ end }}
             - "appgate-server"
             - "--keyring-backend={{ .Values.keyringBackend }}"
             - "--config=/root/.poktroll/config/config.yaml"
@@ -56,17 +68,6 @@ spec:
             - name: metrics
               containerPort: {{ .Values.metrics.port }}
               protocol: TCP
-            - containerPort: 40006 # TODO(@okdas): remove this - currently only needed for LocalNet dlv
-              name: debug
-          # TODO(@okdas): enable health checks
-          # livenessProbe:
-          #   httpGet:
-          #     path: /
-          #     port: http
-          # readinessProbe:
-          #   httpGet:
-          #     path: /
-          #     port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
diff --git a/charts/appgate-server/values.yaml b/charts/appgate-server/values.yaml
index a8efd72..b30de69 100644
--- a/charts/appgate-server/values.yaml
+++ b/charts/appgate-server/values.yaml
@@ -30,6 +30,11 @@ config:
     # If changing port here, make sure to adjust `metrics.serviceMonitor.port`
     addr: :9090
 
+development:
+  delve:
+    enabled: false
+    laddr: :40004
+
 keyringBackend: test
 
 imagePullSecrets: []
diff --git a/charts/poktroll-validator/templates/deployment.yaml b/charts/poktroll-validator/templates/deployment.yaml
index 7abcfd9..84c64f3 100644
--- a/charts/poktroll-validator/templates/deployment.yaml
+++ b/charts/poktroll-validator/templates/deployment.yaml
@@ -66,6 +66,17 @@ spec:
               name: debug
             - containerPort: {{ .Values.service.grpcPort }}
               name: grpc
+{{ if .Values.development.delve.enabled }}
+          command: [ "/go/bin/dlv" ]
+          args:
+            - exec
+            - --listen={{ .Values.development.delve.laddr }}
+            - --headless=true
+            - --api-version=2
+            - --accept-multiclient
+            - /usr/local/bin/poktrolld
+            - --
+{{ else }}
           livenessProbe:
             httpGet:
               path: /
@@ -74,7 +85,8 @@ spec:
             httpGet:
               path: /
               port: {{ .Values.service.rpcPort }}
-          args: 
+          args:
+{{ end }}
             - start
             - --rpc.laddr=tcp://0.0.0.0:36657
             - --p2p.laddr=0.0.0.0:36656
diff --git a/charts/poktroll-validator/values.yaml b/charts/poktroll-validator/values.yaml
index bacf0c3..8530e9b 100644
--- a/charts/poktroll-validator/values.yaml
+++ b/charts/poktroll-validator/values.yaml
@@ -10,6 +10,11 @@ logs:
   level: info
   format: plain
 
+development:
+  delve:
+    enabled: false
+    laddr: :40004
+
 image:
   repository: ghcr.io/pokt-network/poktrolld
   tag: latest
@@ -32,20 +37,18 @@ persistence:
   existingClaim: ""
 scripts:
   enabled: true
-podSecurityContext:
-  {}
-  # allowPrivilegeEscalation: true
-  # capabilities:
-  #   add: ["SYS_PTRACE"]
-resources:
-  {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 8
-  #   memory: 16Gi
-  # requests:
-  #   cpu: 4
-  #   memory: 12Gi
+podSecurityContext: {}
+# allowPrivilegeEscalation: true
+# capabilities:
+#   add: ["SYS_PTRACE"]
+resources: {}
+# We usually recommend not to specify default resources and to leave this as a conscious
+# choice for the user. This also increases chances charts run on environments with little
+# resources, such as Minikube. If you do want to specify resources, uncomment the following
+# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+# limits:
+#   cpu: 8
+#   memory: 16Gi
+# requests:
+#   cpu: 4
+#   memory: 12Gi
diff --git a/charts/relayminer/templates/deployment.yaml b/charts/relayminer/templates/deployment.yaml
index 8b3d4fa..4cbb1a9 100644
--- a/charts/relayminer/templates/deployment.yaml
+++ b/charts/relayminer/templates/deployment.yaml
@@ -35,15 +35,28 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          # command: ["dlv"]
+{{ if .Values.development.delve.enabled }}
+          command: [ "/go/bin/dlv" ]
           args:
-          #   - "exec"
-          #   - "--listen=:40005"
-          #   - "--headless=true"
-          #   - "--api-version=2"
-          #   - "--accept-multiclient"
-          #   - "/usr/local/bin/poktrolld"
-          #   - "--"
+            - exec
+            - --listen={{ .Values.development.delve.laddr }}
+            - --headless=true
+            - --api-version=2
+            - --accept-multiclient
+            - /usr/local/bin/poktrolld
+            - --
+{{ else }}
+          # TODO(@okdas): enable health checks
+          # livenessProbe:
+          #   httpGet:
+          #     path: /
+          #     port: http
+          # readinessProbe:
+          #   httpGet:
+          #     path: /
+          #     port: http
+          args:
+{{ end }}
             - "relayminer"
             - "--keyring-backend={{ .Values.keyringBackend }}"
             - "--config=/root/.poktroll/config/config.yaml"
@@ -55,17 +68,6 @@ spec:
             - name: metrics
               containerPort: {{ .Values.metrics.port }}
               protocol: TCP
-            - containerPort: 40005 # TODO(@okdas): remove this - currently only needed for LocalNet dlv
-              name: debug
-          # TODO(@okdas): enable health checks
-          # livenessProbe:
-          #   httpGet:
-          #     path: /
-          #     port: http
-          # readinessProbe:
-          #   httpGet:
-          #     path: /
-          #     port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
diff --git a/charts/relayminer/values.yaml b/charts/relayminer/values.yaml
index a4eadb2..007a6bd 100644
--- a/charts/relayminer/values.yaml
+++ b/charts/relayminer/values.yaml
@@ -38,6 +38,11 @@ config:
     # If changing port here, make sure to adjust `metrics.serviceMonitor.port`
     addr: :9090
 
+development:
+  delve:
+    enabled: false
+    laddr: :40004
+
 keyringBackend: test
 
 imagePullSecrets: []