diff --git a/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml b/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml
index bcd83f56b6..e1fa18d852 100644
--- a/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml
+++ b/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml
@@ -2,7 +2,11 @@
 apiVersion: v1
 kind: BuildConfig
 metadata:
+{% if ocp4  %}
+  name: "coreos-cincinnati"
+{% else %}
   name: "coreos-cincinnati-stub"
+{% endif %}
   labels:
     app: "coreos-cincinnati"
 spec:
@@ -27,4 +31,8 @@ spec:
   output:
     to:
       kind: "ImageStreamTag"
+{% if ocp4  %}
+      name: "fedora-coreos-cincinnati:gitref-{{fcos_cincinnati_build_git_sha}}"
+{% else %}
       name: "fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_build_git_sha}}"
+{% endif %}
diff --git a/roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml b/roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml
index 5de60899da..39fed5ff73 100644
--- a/roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml
@@ -2,7 +2,11 @@
 apiVersion: v1
 kind: DeploymentConfig
 metadata:
+{% if ocp4  %}
+  name: coreos-cincinnati
+{% else %}
   name: coreos-cincinnati-stub
+{% endif %}
   labels:
     app: coreos-cincinnati
 spec:
@@ -29,7 +33,7 @@ spec:
       containers:
         - name: "fcos-graph-builder"
 {% if ocp4  %}
-          image: "image-registry.openshift-image-registry.svc:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}"
+          image: "image-registry.openshift-image-registry.svc:5000/coreos-cincinnati/fedora-coreos-cincinnati:gitref-{{fcos_cincinnati_deploy_git_sha}}"
 {% else %}
           image: "{{fcos_cincinnati_registry}}:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}"
 {% endif %}
@@ -44,7 +48,7 @@ spec:
               readOnly: true
         - name: "fcos-policy-engine"
 {% if ocp4  %}
-          image: "image-registry.openshift-image-registry.svc:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}"
+          image: "image-registry.openshift-image-registry.svc:5000/coreos-cincinnati/fedora-coreos-cincinnati:gitref-{{fcos_cincinnati_deploy_git_sha}}"
 {% else %}
           image: "{{fcos_cincinnati_registry}}:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}"
 {% endif %}