diff --git a/charts/bee/Chart.yaml b/charts/bee/Chart.yaml
index ce4506d..fcbc3f2 100644
--- a/charts/bee/Chart.yaml
+++ b/charts/bee/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 appVersion: latest
 name: bee
-version: 0.2.2
+version: 0.2.3
 description: Ethereum Swarm Bee Helm chart for Kubernetes
 home: https://swarm.ethereum.org
 icon: https://swarm-guide.readthedocs.io/en/latest/_images/swarm.png
diff --git a/charts/bee/README.md b/charts/bee/README.md
index b48364b..c945c5a 100644
--- a/charts/bee/README.md
+++ b/charts/bee/README.md
@@ -84,7 +84,7 @@ apps:
     namespace: bee
     description: "Ethereum Swarm Bee"
     chart: "ethersphere/bee"
-    version: "0.2.2"
+    version: "0.2.3"
     enabled: true
     set:
       replicaCount: 2
diff --git a/charts/bee/templates/ingress-debug.yaml b/charts/bee/templates/ingress-debug.yaml
index 5c174e8..fd04e59 100644
--- a/charts/bee/templates/ingress-debug.yaml
+++ b/charts/bee/templates/ingress-debug.yaml
@@ -13,7 +13,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ $fullName }}-debug-{{ $i }}
+  name: {{ $fullName }}-{{ $i }}-debug
   labels:
     {{- include "bee.labels" $root | nindent 4 }}
   {{- with $root.Values.ingressDebug.annotations }}
@@ -26,9 +26,9 @@ spec:
   {{- range $root.Values.ingressDebug.hosts }}
     - hosts:
       {{- if .domain }}
-        - {{ $fullName }}-debug-{{ $i }}.{{ .domain }}
+        - {{ $fullName }}-{{ $i }}-debug.{{ .domain }}
       {{- else }}
-        - {{ $fullName }}-debug-{{ $i }}
+        - {{ $fullName }}-{{ $i }}-debug
       {{- end }}
     {{- if .tlsSecret }}
       secretName: {{ .tlsSecret }}
@@ -38,16 +38,16 @@ spec:
   rules:
   {{- range $root.Values.ingressDebug.hosts }}
     {{- if .domain }}
-    - host: {{ $fullName }}-debug-{{ $i }}.{{ .domain }}
+    - host: {{ $fullName }}-{{ $i }}-debug.{{ .domain }}
     {{- else }}
-    - host: {{ $fullName }}-debug-{{ $i }}
+    - host: {{ $fullName }}-{{ $i }}-debug
     {{- end }}
       http:
         paths:
         {{- range .paths }}
           - path: {{ . }}
             backend:
-              serviceName: {{ $fullName }}-debug-{{ $i }}
+              serviceName: {{ $fullName }}-{{ $i }}-debug
               servicePort: debug
         {{- end }}
   {{- end }}
diff --git a/charts/bee/templates/service-debug.yaml b/charts/bee/templates/service-debug.yaml
index d72f834..f41f0a9 100644
--- a/charts/bee/templates/service-debug.yaml
+++ b/charts/bee/templates/service-debug.yaml
@@ -8,7 +8,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "bee.fullname" $root }}-debug-{{ $i }}
+  name: {{ include "bee.fullname" $root }}-{{ $i }}-debug
   labels:
     {{- include "bee.labels" $root | nindent 4 }}
     pod: {{ include "bee.fullname" $root }}-{{ $i }}
diff --git a/charts/bee/templates/service-p2p.yaml b/charts/bee/templates/service-p2p.yaml
index 87eb2d0..3aca5e0 100644
--- a/charts/bee/templates/service-p2p.yaml
+++ b/charts/bee/templates/service-p2p.yaml
@@ -6,7 +6,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "bee.fullname" $root }}-p2p-{{ $i }}
+  name: {{ include "bee.fullname" $root }}-{{ $i }}-p2p
   labels:
     {{- include "bee.labels" $root | nindent 4 }}
     pod: {{ include "bee.fullname" $root }}-{{ $i }}