diff --git a/docker/docker-compose-es-v7.yml b/docker/docker-compose-es-v7.yml
index 7668bebdf7b..8847c65cfbb 100644
--- a/docker/docker-compose-es-v7.yml
+++ b/docker/docker-compose-es-v7.yml
@@ -32,7 +32,7 @@ services:
     environment:
       - discovery.type=single-node
   cadence:
-    image: ubercadence/server:master-auto-setup
+    image: ubercadence/server:0.20.0-auto-setup
     ports:
       - "7933:7933"
       - "7934:7934"
@@ -52,7 +52,7 @@ services:
       - kafka
       - elasticsearch
   cadence-web:
-    image: ubercadence/web:latest
+    image: ubercadence/web:v3.24.0
     environment:
       - "CADENCE_TCHANNEL_PEERS=cadence:7933"
     ports:
diff --git a/docker/docker-compose-es.yml b/docker/docker-compose-es.yml
index c92f3aea338..3409b2c1e31 100644
--- a/docker/docker-compose-es.yml
+++ b/docker/docker-compose-es.yml
@@ -32,7 +32,7 @@ services:
     environment:
       - discovery.type=single-node
   cadence:
-    image: ubercadence/server:master-auto-setup
+    image: ubercadence/server:0.20.0-auto-setup
     ports:
       - "7933:7933"
       - "7934:7934"
@@ -51,7 +51,7 @@ services:
       - kafka
       - elasticsearch
   cadence-web:
-    image: ubercadence/web:latest
+    image: ubercadence/web:v3.24.0
     environment:
       - "CADENCE_TCHANNEL_PEERS=cadence:7933"
     ports:
diff --git a/docker/docker-compose-multiclusters.yml b/docker/docker-compose-multiclusters.yml
index 36ec61cf370..5079e526dba 100644
--- a/docker/docker-compose-multiclusters.yml
+++ b/docker/docker-compose-multiclusters.yml
@@ -33,7 +33,7 @@ services:
       - cassandra
       - statsd
   cadence-secondary:
-    image: ubercadence/server:master-auto-setup
+    image: ubercadence/server:0.20.0-auto-setup
     ports:
      - "7943:7933"
      - "7944:7934"
@@ -55,7 +55,7 @@ services:
       - cassandra
       - statsd
   cadence-web:
-    image: ubercadence/web:latest
+    image: ubercadence/web:v3.24.0
     environment:
       - "CADENCE_TCHANNEL_PEERS=cadence:7933"
     ports:
diff --git a/docker/docker-compose-mysql.yml b/docker/docker-compose-mysql.yml
index d9ad95922aa..b6f93972e81 100644
--- a/docker/docker-compose-mysql.yml
+++ b/docker/docker-compose-mysql.yml
@@ -14,7 +14,7 @@ services:
       - "8125:8125"
       - "8126:8126"
   cadence:
-    image: ubercadence/server:master-auto-setup
+    image: ubercadence/server:0.20.0-auto-setup
     ports:
       - "7933:7933"
       - "7934:7934"
@@ -31,7 +31,7 @@ services:
       - mysql
       - statsd
   cadence-web:
-    image: ubercadence/web:latest
+    image: ubercadence/web:v3.24.0
     environment:
       - "CADENCE_TCHANNEL_PEERS=cadence:7933"
     ports:
diff --git a/docker/docker-compose-postgres.yml b/docker/docker-compose-postgres.yml
index d67bb23d6fc..685687acc0b 100644
--- a/docker/docker-compose-postgres.yml
+++ b/docker/docker-compose-postgres.yml
@@ -15,7 +15,7 @@ services:
       - "8125:8125"
       - "8126:8126"
   cadence:
-    image: ubercadence/server:master-auto-setup
+    image: ubercadence/server:0.20.0-auto-setup
     ports:
       - "7933:7933"
       - "7934:7934"
@@ -32,7 +32,7 @@ services:
     depends_on:
       - postgres
   cadence-web:
-    image: ubercadence/web:latest
+    image: ubercadence/web:v3.24.0
     environment:
       - "CADENCE_TCHANNEL_PEERS=cadence:7933"
     ports:
diff --git a/docker/docker-compose-prometheus.yml b/docker/docker-compose-prometheus.yml
index d79d7781d2b..bc5cd7686c2 100644
--- a/docker/docker-compose-prometheus.yml
+++ b/docker/docker-compose-prometheus.yml
@@ -17,7 +17,7 @@ services:
     ports:
       - '9100:9100'
   cadence:
-    image: ubercadence/server:master-auto-setup
+    image: ubercadence/server:0.20.0-auto-setup
     ports:
      - "8000:8000"
      - "8001:8001"
@@ -38,7 +38,7 @@ services:
       - cassandra
       - prometheus
   cadence-web:
-    image: ubercadence/web:latest
+    image: ubercadence/web:v3.24.0
     environment:
       - "CADENCE_TCHANNEL_PEERS=cadence:7933"
     ports:
diff --git a/docker/docker-compose-scylla.yml b/docker/docker-compose-scylla.yml
index ae678185bf6..4d72da879ff 100644
--- a/docker/docker-compose-scylla.yml
+++ b/docker/docker-compose-scylla.yml
@@ -15,7 +15,7 @@ services:
       - "8125:8125"
       - "8126:8126"
   cadence:
-    image: ubercadence/server:master-auto-setup
+    image: ubercadence/server:0.20.0-auto-setup
     ports:
       - "7933:7933"
       - "7934:7934"
@@ -30,7 +30,7 @@ services:
       - scylla
       - statsd
   cadence-web:
-    image: ubercadence/web:latest
+    image: ubercadence/web:v3.24.0
     environment:
       - "CADENCE_TCHANNEL_PEERS=cadence:7933"
     ports:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 5afc8565ace..757e08907e0 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - "8125:8125"
       - "8126:8126"
   cadence:
-    image: ubercadence/server:master-auto-setup
+    image: ubercadence/server:0.20.0-auto-setup
     ports:
      - "7933:7933"
      - "7934:7934"
@@ -26,7 +26,7 @@ services:
       - cassandra
       - statsd
   cadence-web:
-    image: ubercadence/web:latest
+    image: ubercadence/web:v3.24.0
     environment:
       - "CADENCE_TCHANNEL_PEERS=cadence:7933"
     ports: