diff --git a/playbooks/openshift-apps/monitor_gating.yml b/playbooks/openshift-apps/monitor_gating.yml
index c03d4404a0..25c65fdc76 100644
--- a/playbooks/openshift-apps/monitor_gating.yml
+++ b/playbooks/openshift-apps/monitor_gating.yml
@@ -10,7 +10,7 @@
 
   roles:
   - role: openshift/project
-    app: monitor_gating
+    app: monitor-gating
     description: Monitor the packager and gating workflow
     appowners:
     - cverna
@@ -18,39 +18,39 @@
     - asaleh
 
   - role: openshift/object
-    app: monitor_gating
+    app: monitor-gating
     template: imagestream.yml
     objectname: imagestream.yml
 
   - role: openshift/object
-    app: monitor_gating
+    app: monitor-gating
     template: buildconfig.yml
     objectname: buildconfig.yml
 
   - role: openshift/object
-    app: monitor_gating
+    app: monitor-gating
     template: configmap.yml
     objectname: configmap.yml
 
   - role: openshift/object
-    app: monitor_gating
+    app: monitor-gating
     template: secret.yml
     objectname: secret.yml
 
   - role: openshift/secret-file
-    app: monitor_gating
-    secret_name: monitor_gating-ssh
+    app: monitor-gating
+    secret_name: monitor-gating-ssh
     key: id_rsa
     privatefile: "git-ssh/monitor_gating"
 
   - role: openshift/object
-    app: monitor_gating
+    app: monitor-gating
     template: deploymentconfig.yml
     objectname: deploymentconfig.yml
 
   - role: openshift/start-build
-    app: monitor_gating
-    buildname: monitor_gating-build
-    objectname: monitor_gating-build
+    app: monitor-gating
+    buildname: monitor-gating-build
+    objectname: monitor-gating-build
     tags:
         - build
diff --git a/roles/openshift-apps/monitor_gating/templates/buildconfig.yml b/roles/openshift-apps/monitor_gating/templates/buildconfig.yml
index bbff8ef5c4..3561037305 100644
--- a/roles/openshift-apps/monitor_gating/templates/buildconfig.yml
+++ b/roles/openshift-apps/monitor_gating/templates/buildconfig.yml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: BuildConfig
 metadata:
-  name: monitor_gating_build
+  name: monitor-gating-build
   labels:
     environment: "monitor-gating"
 spec:
@@ -22,4 +22,4 @@ spec:
   output:
     to:
       kind: ImageStreamTag
-      name: monitor_gating:latest
+      name: monitor-gating:latest
diff --git a/roles/openshift-apps/monitor_gating/templates/configmap.yml b/roles/openshift-apps/monitor_gating/templates/configmap.yml
index c138286711..bde8ee94a1 100644
--- a/roles/openshift-apps/monitor_gating/templates/configmap.yml
+++ b/roles/openshift-apps/monitor_gating/templates/configmap.yml
@@ -3,9 +3,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: monitor_gating-configmap
+  name: monitor-gating-configmap
   labels:
-    app: monitor_gating
+    app: monitor-gating
 data:
   runner.cfg: |-
     {{ load_file('runner.cfg') | indent }}
diff --git a/roles/openshift-apps/monitor_gating/templates/deploymentconfig.yml b/roles/openshift-apps/monitor_gating/templates/deploymentconfig.yml
index 1c41ea4eb1..8682106b69 100644
--- a/roles/openshift-apps/monitor_gating/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/monitor_gating/templates/deploymentconfig.yml
@@ -3,45 +3,45 @@ apiVersion: v1
 kind: DeploymentConfig
 metadata:
   labels:
-    app: monitor_gating
-  name: monitor_gating
+    app: monitor-gating
+  name: monitor-gating
 spec:
   replicas: 1
   selector:
-    app: monitor_gating
-    deploymentconfig: monitor_gating
+    app: monitor-gating
+    deploymentconfig: monitor-gating
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: monitor_gating
-        deploymentconfig: monitor_gating
+        app: monitor-gating
+        deploymentconfig: monitor-gating
     spec:
       containers:
-      - name: monitor_gating
-        image: monitor_gating:latest
+      - name: monitor-gating
+        image: monitor-gating:latest
         resources: {}
         volumeMounts:
         - name: config-volume
           mountPath: /config/
           readOnly: true
-        - name: monitor_gating-secret-volume
+        - name: monitor-gating-secret-volume
           mountPath: /config/app-config/
           readOnly: true
-        - name: monitor_gating-ssh-volume
+        - name: monitor-gating-ssh-volume
           mountPath: /root/.ssh/
           readOnly: true
       volumes:
       - name: config-volume
         configMap:
-          name: monitor_gating-configmap
-       - name: monitor_gating-secret-volume
+          name: monitor-gating-configmap
+       - name: monitor-gating-secret-volume
          secret:
-           secretName: monitor_gating-secret
-       - name: monitor_gating-ssh-volume
+           secretName: monitor-gating-secret
+       - name: monitor-gating-ssh-volume
          secret:
-           secretName: monitor_gating-ssh
+           secretName: monitor-gating-ssh
 
   triggers:
   - type: ConfigChange
@@ -49,7 +49,7 @@ spec:
     imageChangeParams:
       automatic: true
       containerNames:
-      - monitor_gating
+      - monitor-gating
       from:
         kind: ImageStreamTag
-        name: monitor_gating:latest
+        name: monitor-gating:latest
diff --git a/roles/openshift-apps/monitor_gating/templates/imagestream.yml b/roles/openshift-apps/monitor_gating/templates/imagestream.yml
index 637ce639d3..49b25f9721 100644
--- a/roles/openshift-apps/monitor_gating/templates/imagestream.yml
+++ b/roles/openshift-apps/monitor_gating/templates/imagestream.yml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: ImageStream
 metadata:
-   name: "monitor_gating"
+   name: "monitor-gating"
diff --git a/roles/openshift-apps/monitor_gating/templates/secret.yml b/roles/openshift-apps/monitor_gating/templates/secret.yml
index 22aab5a5df..c4bb464de5 100644
--- a/roles/openshift-apps/monitor_gating/templates/secret.yml
+++ b/roles/openshift-apps/monitor_gating/templates/secret.yml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: monitor_gating-secret
+  name: monitor-gating-secret
   labels:
-    app: monitor_gating
+    app: monitor-gating
 stringData:
   monitor_gating.cfg: |-
     {{ load_file('monitor_gating.cfg') | indent }}