diff --git a/cp-all-in-one-cloud/.env b/cp-all-in-one-cloud/.env
new file mode 120000
index 000000000..a6864c9fb
--- /dev/null
+++ b/cp-all-in-one-cloud/.env
@@ -0,0 +1 @@
+../utils/config.env
\ No newline at end of file
diff --git a/cp-all-in-one-cloud/docker-compose.yml b/cp-all-in-one-cloud/docker-compose.yml
index d8987db2d..d647a5690 100644
--- a/cp-all-in-one-cloud/docker-compose.yml
+++ b/cp-all-in-one-cloud/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
 
   schema-registry:
-    image: confluentinc/cp-schema-registry:5.4.1
+    image: ${REPOSITORY}/cp-schema-registry:${TAG}
     hostname: schema-registry
     container_name: schema-registry
     ports:
@@ -18,7 +18,7 @@ services:
       SCHEMA_REGISTRY_KAFKASTORE_SASL_MECHANISM: "PLAIN"
 
   ksql-server:
-    image: confluentinc/cp-ksql-server:5.4.1
+    image: ${REPOSITORY}/cp-ksql-server:${TAG}
     hostname: ksql-server
     container_name: ksql-server
     ports:
@@ -60,13 +60,13 @@ services:
       KSQL_KSQL_CONNECT_URL: "http://connect:8083"
 
   ksql-cli:
-    image: confluentinc/cp-ksql-cli:5.4.1
+    image: ${REPOSITORY}/cp-ksql-cli:${TAG}
     container_name: ksql-cli
     entrypoint: /bin/sh
     tty: true
 
   control-center:
-    image: confluentinc/cp-enterprise-control-center:5.4.1
+    image: ${REPOSITORY}/cp-enterprise-control-center:${TAG}
     hostname: control-center
     container_name: control-center
     depends_on:
@@ -155,7 +155,7 @@ services:
       CONNECT_CONSUMER_CONFLUENT_MONITORING_INTERCEPTOR_SASL_MECHANISM: PLAIN
 
   rest-proxy:
-    image: confluentinc/cp-kafka-rest:5.4.1
+    image: ${REPOSITORY}/cp-kafka-rest:${TAG}
     depends_on:
       - schema-registry
     ports:
diff --git a/cp-all-in-one-community/.env b/cp-all-in-one-community/.env
new file mode 120000
index 000000000..a6864c9fb
--- /dev/null
+++ b/cp-all-in-one-community/.env
@@ -0,0 +1 @@
+../utils/config.env
\ No newline at end of file
diff --git a/cp-all-in-one-community/docker-compose.yml b/cp-all-in-one-community/docker-compose.yml
index feae3822d..1a492ee70 100644
--- a/cp-all-in-one-community/docker-compose.yml
+++ b/cp-all-in-one-community/docker-compose.yml
@@ -2,7 +2,7 @@
 version: '2'
 services:
   zookeeper:
-    image: confluentinc/cp-zookeeper:5.4.1
+    image: ${REPOSITORY}/cp-zookeeper:${TAG}
     hostname: zookeeper
     container_name: zookeeper
     ports:
@@ -12,7 +12,7 @@ services:
       ZOOKEEPER_TICK_TIME: 2000
 
   broker:
-    image: confluentinc/cp-kafka:5.4.1
+    image: ${REPOSITORY}/cp-kafka:${TAG}
     hostname: broker
     container_name: broker
     depends_on:
@@ -29,7 +29,7 @@ services:
       KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
 
   schema-registry:
-    image: confluentinc/cp-schema-registry:5.4.1
+    image: ${REPOSITORY}/cp-schema-registry:${TAG}
     hostname: schema-registry
     container_name: schema-registry
     depends_on:
@@ -73,7 +73,7 @@ services:
       CONNECT_LOG4J_LOGGERS: org.apache.zookeeper=ERROR,org.I0Itec.zkclient=ERROR,org.reflections=ERROR
 
   ksql-server:
-    image: confluentinc/cp-ksql-server:5.4.1
+    image: ${REPOSITORY}/cp-ksql-server:${TAG}
     hostname: ksql-server
     container_name: ksql-server
     depends_on:
@@ -94,7 +94,7 @@ services:
       KSQL_KSQL_CONNECT_URL: "http://connect:8083"
 
   ksql-cli:
-    image: confluentinc/cp-ksql-cli:5.4.1
+    image: ${REPOSITORY}/cp-ksql-cli:${TAG}
     container_name: ksql-cli
     depends_on:
       - broker
@@ -105,7 +105,7 @@ services:
 
   ksql-datagen:
     # Downrev ksql-examples to 5.1.2 due to DEVX-798 (work around issues in 5.2.0)
-    image: confluentinc/ksql-examples:5.4.1
+    image: ${REPOSITORY}/ksql-examples:${TAG}
     hostname: ksql-datagen
     container_name: ksql-datagen
     depends_on:
@@ -128,7 +128,7 @@ services:
       STREAMS_SCHEMA_REGISTRY_PORT: 8081
 
   rest-proxy:
-    image: confluentinc/cp-kafka-rest:5.4.1
+    image: ${REPOSITORY}/cp-kafka-rest:${TAG}
     depends_on:
       - zookeeper
       - broker
diff --git a/cp-all-in-one/.env b/cp-all-in-one/.env
new file mode 120000
index 000000000..a6864c9fb
--- /dev/null
+++ b/cp-all-in-one/.env
@@ -0,0 +1 @@
+../utils/config.env
\ No newline at end of file
diff --git a/cp-all-in-one/docker-compose.yml b/cp-all-in-one/docker-compose.yml
index bd0d85c4b..096cd0857 100644
--- a/cp-all-in-one/docker-compose.yml
+++ b/cp-all-in-one/docker-compose.yml
@@ -2,7 +2,7 @@
 version: '2'
 services:
   zookeeper:
-    image: confluentinc/cp-zookeeper:5.4.1
+    image: ${REPOSITORY}/cp-zookeeper:${TAG}
     hostname: zookeeper
     container_name: zookeeper
     ports:
@@ -12,7 +12,7 @@ services:
       ZOOKEEPER_TICK_TIME: 2000
 
   broker:
-    image: confluentinc/cp-server:5.4.1
+    image: ${REPOSITORY}/cp-server:${TAG}
     hostname: broker
     container_name: broker
     depends_on:
@@ -35,7 +35,7 @@ services:
       CONFLUENT_SUPPORT_CUSTOMER_ID: 'anonymous'
 
   schema-registry:
-    image: confluentinc/cp-schema-registry:5.4.1
+    image: ${REPOSITORY}/cp-schema-registry:${TAG}
     hostname: schema-registry
     container_name: schema-registry
     depends_on:
@@ -83,7 +83,7 @@ services:
       CONNECT_LOG4J_LOGGERS: org.apache.zookeeper=ERROR,org.I0Itec.zkclient=ERROR,org.reflections=ERROR
 
   control-center:
-    image: confluentinc/cp-enterprise-control-center:5.4.1
+    image: ${REPOSITORY}/cp-enterprise-control-center:${TAG}
     hostname: control-center
     container_name: control-center
     depends_on:
@@ -108,7 +108,7 @@ services:
       PORT: 9021
 
   ksql-server:
-    image: confluentinc/cp-ksql-server:5.4.1
+    image: ${REPOSITORY}/cp-ksql-server:${TAG}
     hostname: ksql-server
     container_name: ksql-server
     depends_on:
@@ -129,7 +129,7 @@ services:
       KSQL_KSQL_CONNECT_URL: "http://connect:8083"
 
   ksql-cli:
-    image: confluentinc/cp-ksql-cli:5.4.1
+    image: ${REPOSITORY}/cp-ksql-cli:${TAG}
     container_name: ksql-cli
     depends_on:
       - broker
@@ -139,8 +139,7 @@ services:
     tty: true
 
   ksql-datagen:
-    # Downrev ksql-examples to 5.1.2 due to DEVX-798 (work around issues in 5.2.0)
-    image: confluentinc/ksql-examples:5.4.1
+    image: ${REPOSITORY}/ksql-examples:${TAG}
     hostname: ksql-datagen
     container_name: ksql-datagen
     depends_on:
@@ -163,7 +162,7 @@ services:
       STREAMS_SCHEMA_REGISTRY_PORT: 8081
 
   rest-proxy:
-    image: confluentinc/cp-kafka-rest:5.4.1
+    image: ${REPOSITORY}/cp-kafka-rest:${TAG}
     depends_on:
       - zookeeper
       - broker