diff --git a/charts/geoserver/prod/ingress-web.yaml b/charts/geoserver/prod/ingress-web.yaml
index ab14ddf7..4001b2b4 100644
--- a/charts/geoserver/prod/ingress-web.yaml
+++ b/charts/geoserver/prod/ingress-web.yaml
@@ -7,7 +7,7 @@ metadata:
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     atlantis.oceanbox.io/expose: internal
   labels:
-    app.kubernetes.io/instance: geoserver
+    app.kubernetes.io/instance: prod-geoserver
     app.kubernetes.io/name: geoserver
   name: geoserver-internal
   namespace: geoserver
@@ -19,7 +19,7 @@ spec:
       paths:
       - backend:
           service:
-            name: geoserver
+            name: prod-geoserver
             port:
               number: 8080
         path: /geoserver
diff --git a/charts/geoserver/staging/ingress-web.yaml b/charts/geoserver/staging/ingress-web.yaml
index ce2a7420..a7e22c4e 100644
--- a/charts/geoserver/staging/ingress-web.yaml
+++ b/charts/geoserver/staging/ingress-web.yaml
@@ -7,7 +7,7 @@ metadata:
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     atlantis.oceanbox.io/expose: internal
   labels:
-    app.kubernetes.io/instance: geoserver
+    app.kubernetes.io/instance: staging-geoserver
     app.kubernetes.io/name: geoserver
   name: geoserver-internal
   namespace: geoserver
@@ -19,7 +19,7 @@ spec:
       paths:
       - backend:
           service:
-            name: geoserver
+            name: staging-geoserver
             port:
               number: 8080
         path: /geoserver
diff --git a/charts/geoserver/values-staging.yaml b/charts/geoserver/values-staging.yaml
index 9677ae0f..36691ebc 100644
--- a/charts/geoserver/values-staging.yaml
+++ b/charts/geoserver/values-staging.yaml
@@ -10,10 +10,10 @@ image:
 
 auth:
   username: admin
-  password: geoserver
+  # password: geoserver
   # use an existing secret if specified
-  #existingSecret: geoserver-admin-password
-  #passwordKey: geoserver-admin-password
+  existingSecret: staging-geoserver
+  passwordKey: geoserver-admin-password
 
 cors:
   enabled: true