diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml
index 53e5ace9d6..c08fc4af67 100644
--- a/playbooks/openshift-apps/koschei.yml
+++ b/playbooks/openshift-apps/koschei.yml
@@ -22,7 +22,7 @@
     objectname: backend-config.yml
 
   - role: openshift/keytab
-    secret_name: backend-keytab
+    secret_name: keytab
     key: krb5.keytab
     service: koschei
     host: "koschei-backend01{{ env_suffix }}.phx2.fedoraproject.org"
@@ -36,13 +36,13 @@
     objectname: frontend-service.yml
 
   - role: openshift/route
-    routename: frontend-route
+    routename: frontend
     host: "koschei{{ env_suffix }}.fedoraproject.org"
     serviceport: web
-    servicename: frontend-service
+    servicename: frontend
 
   - role: openshift/rollout
-    dcname: frontend-deployment
+    dcname: frontend
     when: False
 
   tasks:
diff --git a/roles/openshift-apps/koschei/templates/backend-deployment.yml b/roles/openshift-apps/koschei/templates/backend-deployment.yml
index 4f0d7ed666..5af4118963 100644
--- a/roles/openshift-apps/koschei/templates/backend-deployment.yml
+++ b/roles/openshift-apps/koschei/templates/backend-deployment.yml
@@ -2,19 +2,19 @@
 apiVersion: v1
 kind: DeploymentConfig
 metadata:
-  name: {{service}}-deployment
+  name: {{service}}
   labels:
-    service: {{service}}-service
+    service: {{service}}
 spec:
   replicas: 1
   selector:
-    service: {{service}}-service
+    service: {{service}}
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        service: {{service}}-service
+        service: {{service}}
     spec:
       containers:
       - name: {{service}}
@@ -26,10 +26,10 @@ spec:
           - name: KRB5_CLIENT_KTNAME
             value: /etc/krb5.keytab
         volumeMounts:
-        - name: config-volume
+        - name: config
           mountPath: /etc/koschei
           readOnly: true
-        - name: keytab-volume
+        - name: keytab
           mountPath: /etc/krb5.keytab
           subPath: krb5.keytab
           readOnly: true
@@ -37,9 +37,9 @@ spec:
           limits:
             memory: {{memory}}Mi
       volumes:
-      - name: config-volume
+      - name: config
         secret:
           secretName: backend-config
-      - name: keytab-volume
+      - name: keytab
         secret:
-          secretName: backend-keytab
+          secretName: keytab
diff --git a/roles/openshift-apps/koschei/templates/frontend-deployment.yml b/roles/openshift-apps/koschei/templates/frontend-deployment.yml
index 2679a21253..e7e8f509b1 100644
--- a/roles/openshift-apps/koschei/templates/frontend-deployment.yml
+++ b/roles/openshift-apps/koschei/templates/frontend-deployment.yml
@@ -2,19 +2,19 @@
 apiVersion: v1
 kind: DeploymentConfig
 metadata:
-  name: frontend-deployment
+  name: frontend
   labels:
-    service: frontend-service
+    service: frontend
 spec:
   replicas: 1
   selector:
-    service: frontend-service
+    service: frontend
   strategy:
     type: Rolling
   template:
     metadata:
       labels:
-        service: frontend-service
+        service: frontend
     spec:
       containers:
       - name: frontend
@@ -23,7 +23,7 @@ spec:
         ports:
         - containerPort: 8080
         volumeMounts:
-        - name: config-volume
+        - name: config
           mountPath: /etc/koschei
           readOnly: true
         readinessProbe:
@@ -42,6 +42,6 @@ spec:
           limits:
             memory: 256Mi
       volumes:
-      - name: config-volume
+      - name: config
         secret:
           secretName: frontend-config
diff --git a/roles/openshift-apps/koschei/templates/frontend-service.yml b/roles/openshift-apps/koschei/templates/frontend-service.yml
index d481524708..695a471797 100644
--- a/roles/openshift-apps/koschei/templates/frontend-service.yml
+++ b/roles/openshift-apps/koschei/templates/frontend-service.yml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: frontend-service
+  name: frontend
 spec:
   selector:
-    service: frontend-service
+    service: frontend
   ports:
   - name: web
     port: 8080