diff --git a/roles/openshift-apps/bodhi/files/service.yml b/roles/openshift-apps/bodhi/files/service.yml
index cde38fc778..058b1b681f 100644
--- a/roles/openshift-apps/bodhi/files/service.yml
+++ b/roles/openshift-apps/bodhi/files/service.yml
@@ -13,4 +13,4 @@ spec:
       port: 8080
       targetPort: 8080
   selector:
-    service: web
+    deployment: bodhi-web
diff --git a/roles/openshift-apps/bodhi/templates/deployment.yml.j2 b/roles/openshift-apps/bodhi/templates/deployment.yml.j2
index a42277fa5a..1da8e2a77f 100644
--- a/roles/openshift-apps/bodhi/templates/deployment.yml.j2
+++ b/roles/openshift-apps/bodhi/templates/deployment.yml.j2
@@ -11,8 +11,7 @@ spec:
   replicas: {{ bodhi_openshift_pods }}
   selector:
     matchLabels:
-      app: bodhi
-      service: web
+      app: bodhi-web
   strategy:
     type: Recreate
   template:
@@ -128,8 +127,7 @@ spec:
 {% endif %}
   selector:
     matchLabels:
-      app: bodhi
-      service: consumer
+      app: bodhi-consumer
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -208,8 +206,7 @@ spec:
   replicas: {{ bodhi_openshift_pods }}
   selector:
     matchLabels:
-      app: bodhi
-      service: celery
+      app: bodhi-celery
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -288,8 +285,7 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: bodhi
-      service: celery-beat
+      app: bodhi-celery-beat
   strategy:
     type: RollingUpdate
     rollingUpdate: