diff --git a/charts/brokencrystals/templates/keycloak-deployment.yaml b/charts/brokencrystals/templates/keycloak-deployment.yaml
index 8487f439..f5dcbe52 100644
--- a/charts/brokencrystals/templates/keycloak-deployment.yaml
+++ b/charts/brokencrystals/templates/keycloak-deployment.yaml
@@ -2,21 +2,21 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "brokencrystals.fullname" . }}-keycloak-prod
+  name: {{ include "brokencrystals.fullname" . }}-keycloak
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "brokencrystals.fullname" . }}-keycloak-prod
+    app: {{ include "brokencrystals.fullname" . }}-keycloak
 spec:
   selector:
     matchLabels:
-      app: {{ include "brokencrystals.fullname" . }}-keycloak-prod
+      app: {{ include "brokencrystals.fullname" . }}-keycloak
   template:
     metadata:
       labels:
-        app: {{ include "brokencrystals.fullname" . }}-keycloak-prod
+        app: {{ include "brokencrystals.fullname" . }}-keycloak
     spec:
       containers:
-        - name: {{ include "brokencrystals.fullname" . }}-keycloak-prod
+        - name: {{ include "brokencrystals.fullname" . }}-keycloak
           image: jboss/keycloak:latest
           resources:
             requests:
@@ -34,7 +34,7 @@ spec:
             - name: DB_VENDOR
               value: "POSTGRES"
             - name: DB_ADDR
-              value: "{{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod-service"
+              value: "{{ include "brokencrystals.fullname" . }}-keycloak-postgres"
             - name: DB_DATABASE
               value: "keycloak"
             - name: DB_SCHEMA
@@ -66,11 +66,11 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "brokencrystals.fullname" . }}-keycloak-prod-service
+  name: {{ include "brokencrystals.fullname" . }}-keycloak
   namespace: {{ .Release.Namespace }}
 spec:
   selector:
-    app: {{ include "brokencrystals.fullname" . }}-keycloak-prod
+    app: {{ include "brokencrystals.fullname" . }}-keycloak
   ports:
     - name: http
       port: 8080
diff --git a/charts/brokencrystals/templates/keycloak-postgres-deployment.yaml b/charts/brokencrystals/templates/keycloak-postgres-deployment.yaml
index aed59058..d4f79422 100644
--- a/charts/brokencrystals/templates/keycloak-postgres-deployment.yaml
+++ b/charts/brokencrystals/templates/keycloak-postgres-deployment.yaml
@@ -2,21 +2,21 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod
+  name: {{ include "brokencrystals.fullname" . }}-keycloak-postgres
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod
+    app: {{ include "brokencrystals.fullname" . }}-keycloak-postgres
 spec:
   selector:
     matchLabels:
-      app: {{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod
+      app: {{ include "brokencrystals.fullname" . }}-keycloak-postgres
   template:
     metadata:
       labels:
-        app: {{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod
+        app: {{ include "brokencrystals.fullname" . }}-keycloak-postgres
     spec:
       containers:
-        - name: {{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod
+        - name: {{ include "brokencrystals.fullname" . }}-keycloak-postgres
           image: postgres:12.2-alpine
           livenessProbe:
             tcpSocket:
@@ -40,11 +40,11 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod-service
+  name: {{ include "brokencrystals.fullname" . }}-keycloak-postgres
   namespace: {{ .Release.Namespace }}
 spec:
   selector:
-    app: {{ include "brokencrystals.fullname" . }}-keycloak-postgres-prod
+    app: {{ include "brokencrystals.fullname" . }}-keycloak-postgres
   ports:
     - name: postgres-keycloak
       port: 5432