diff --git a/templates/pgadmin/ingress_pgadmin.yaml b/templates/pgadmin/ingress_pgadmin.yaml
index 45ae03b..cc1dc28 100644
--- a/templates/pgadmin/ingress_pgadmin.yaml
+++ b/templates/pgadmin/ingress_pgadmin.yaml
@@ -8,9 +8,7 @@ metadata:
     nginx.ingress.kubernetes.io/ssl-redirect: 'true'
     nginx.ingress.kubernetes.io/ssl-passthrough: 'true'
     nginx.ingress.kubernetes.io/backend-protocol: HTTPS
-  labels:
-    type: pgadmin
-  name: sma-pgadmin
+  name: "{{ .Values.stage }}-pgadmin"
 spec:
   rules:
   - host: {{ .Values.pgadmin.name }}
@@ -18,7 +16,7 @@ spec:
       paths:
       - backend:
           service:
-            name: "{{ .Release.Name }}-pgadmin-service"
+            name: "{{ .Values.stage }}-pgadmin-service"
             port:
               number: 80
         path: /