diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index 75a206af70..e39ca76fdf 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -19,7 +19,7 @@ version: '2'
 
 services:
   source:
-    image: trafficcontrol/source_tarballer:master
+    image: apache/traffic_source_tarballer:master
     #build:
     #  dockerfile: infrastructure/docker/build/Dockerfile-source
     #  context: ../../..
@@ -27,7 +27,7 @@ services:
       - ../../..:/trafficcontrol:z
 
   traffic_monitor_build:
-    image: trafficcontrol/traffic_monitor_builder:master
+    image: apache/traffic_monitor_builder:master
     #build:
     #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_monitor
     #  context: ../../..
@@ -35,7 +35,7 @@ services:
       - ../../..:/trafficcontrol:z
 
   traffic_ops_build:
-    image: trafficcontrol/traffic_ops_builder:master
+    image: apache/traffic_ops_builder:master
     #build:
     #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops
     #  context: ../../..
@@ -43,7 +43,7 @@ services:
       - ../../..:/trafficcontrol:z
 
   traffic_portal_build:
-    image: trafficcontrol/traffic_portal_builder:master
+    image: apache/traffic_portal_builder:master
     #build:
     #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_portal
     #  context: ../../..
@@ -51,7 +51,7 @@ services:
       - ../../..:/trafficcontrol:z
 
   traffic_router_build:
-    image: trafficcontrol/traffic_router_builder:master
+    image: apache/traffic_router_builder:master
     #build:
     #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_router
     #  context: ../../..
@@ -60,7 +60,7 @@ services:
       - ../../../.m2:/root/.m2:z
 
   traffic_stats_build:
-    image: trafficcontrol/traffic_stats_builder:master
+    image: apache/traffic_stats_builder:master
     #build:
     #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_stats
     #  context: ../../..
@@ -68,7 +68,7 @@ services:
       - ../../..:/trafficcontrol:z
 
   grove_build:
-    image: trafficcontrol/grove_builder:master
+    image: apache/traffic_grove_builder:master
     #build:
     #  dockerfile: infrastructure/docker/build/Dockerfile-grove
     #  context: ../../..
@@ -76,7 +76,7 @@ services:
       - ../../..:/trafficcontrol:z
 
   grovetccfg_build:
-    image: trafficcontrol/grovetccfg_builder:master
+    image: apache/traffic_grovetccfg_builder:master
     #build:
     #  dockerfile: infrastructure/docker/build/Dockerfile-grovetccfg
     #  context: ../../..
@@ -90,7 +90,7 @@ services:
     command: ['-f', '/trafficcontrol/dist/weasel.txt', '/trafficcontrol']
 
   docs:
-    image: trafficcontrol/docs_builder:master
+    image: apache/traffic_docs_builder:master
     #build:
     #  dockerfile: infrastructure/docker/build/Dockerfile-docs
     #  context: ../../..