diff --git a/templates/pgadmin/ingress_pgadmin.yaml b/templates/pgadmin/ingress_pgadmin.yaml
index 367a42a..23edb4e 100644
--- a/templates/pgadmin/ingress_pgadmin.yaml
+++ b/templates/pgadmin/ingress_pgadmin.yaml
@@ -11,7 +11,7 @@ metadata:
 {{- if .Values.pgadmin.ingress.customIpWhitelist }}
     nginx.ingress.kubernetes.io/whitelist-source-range: {{ .Values.pgadmin.ingress.customIpWhitelist }}
 {{- end }}
-  name: "{{ .Values.stage }}-pgadmin"
+  name: "{{ .Values.stage }}-pgadmin-ingress"
 spec:
   rules:
   - host: {{ .Values.pgadmin.name }}
diff --git a/templates/pgadmin/statefulset.yaml b/templates/pgadmin/statefulset.yaml
index 734ae71..d881622 100644
--- a/templates/pgadmin/statefulset.yaml
+++ b/templates/pgadmin/statefulset.yaml
@@ -4,7 +4,7 @@ kind: StatefulSet
 metadata:
   name: '{{ .Values.stage }}-pgadmin'
 spec:
-  serviceName: '{{ .Values.stage }}-pgadmin-service'
+  serviceName: '{{ .Values.stage }}-pgadmin'
   podManagementPolicy: Parallel
   replicas: 1
   selector: