diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml
index f148f1fed..2659c4618 100644
--- a/container-images/overcloud_containers.yaml
+++ b/container-images/overcloud_containers.yaml
@@ -109,10 +109,10 @@ container_images:
 - imagename: docker.io/openshift/origin:v3.10.0
 - imagename: docker.io/openshift/node:v3.10.0
 - imagename: docker.io/openshift/origin-deployer:v3.10.0
+- imagename: docker.io/openshift/origin-docker-builder:v3.10.0
 - imagename: docker.io/openshift/origin-docker-registry:v3.10.0
 - imagename: docker.io/openshift/origin-haproxy-router:v3.10.0
 - imagename: docker.io/openshift/origin-pod:v3.10.0
-- imagename: docker.io/openshift/origin-sti-builder:v3.10.0
 - imagename: docker.io/openshift/origin-web-console:v3.10.0
 - imagename: docker.io/cockpit/kubernetes:latest
 - imagename: registry.fedoraproject.org/latest/etcd:latest
diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2
index 67e0dfca7..dd41f48d8 100644
--- a/container-images/overcloud_containers.yaml.j2
+++ b/container-images/overcloud_containers.yaml.j2
@@ -817,6 +817,12 @@ container_images_template:
   services:
   - OS::TripleO::Services::OpenShift::Master
 
+- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-docker-builder:{{openshift_tag}}"
+  params:
+  - DockerOpenShiftDockerBuilderImage
+  services:
+  - OS::TripleO::Services::OpenShift::Worker
+
 - imagename: "{{openshift_namespace}}/{{openshift_base_image}}-docker-registry:{{openshift_tag}}"
   params:
   - DockerOpenShiftDockerRegistryImage
@@ -837,12 +843,6 @@ container_images_template:
   - OS::TripleO::Services::OpenShift::Master
   - OS::TripleO::Services::OpenShift::Worker
 
-- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-sti-builder:{{openshift_tag}}"
-  params:
-  - DockerOpenShiftStiBuilderImage
-  services:
-  - OS::TripleO::Services::OpenShift::Worker
-
 - imagename: "{{openshift_namespace}}/{{openshift_base_image}}-web-console:{{openshift_tag}}"
   params:
   - DockerOpenShiftWebConsoleImage