diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83b7efbf6..acfb6b90f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v0.17.21
+
+* Upgrade to OVS 2.17.2
+* Upgrade faucetconfrpc, faucet, gauge, pylint, pytype, cmd2, grafana, prometheus, pika, flask
+
 # v0.17.20 (2022-06-13)
 
 * Upgrade to OVS 2.17.1
diff --git a/VERSION b/VERSION
index 7f0c25766..ccb008921 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.17.21.dev
+0.17.21
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 828f69577..beb14716b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.7'
 services:
     rabbit:
         restart: always
-        image: 'iqtlabs/rabbitmq:latest'
+        image: 'iqtlabs/rabbitmq:v0.17.21'
         ports:
             - '127.0.0.1:15672:15672'
             - '5672:5672'
@@ -12,9 +12,6 @@ services:
                     - RABBIT_SERVER
                     - rabbitmq
                     - messenger
-        build:
-            context: helpers/rabbitmq
-            dockerfile: Dockerfile
     network_tap:
         restart: always
         image: 'iqtlabs/network_tap:v0.11.33'
@@ -28,7 +25,7 @@ services:
             poseidon:
     poseidon_api:
         restart: always
-        image: 'iqtlabs/poseidon-api:latest'
+        image: 'iqtlabs/poseidon-api:v0.17.21'
         ports:
             - '5000:8000'
         environment:
@@ -41,12 +38,9 @@ services:
                     - poseidon-api
         depends_on:
             - poseidon
-        build:
-            context: helpers/api
-            dockerfile: Dockerfile
     poseidon:
         restart: always
-        image: 'iqtlabs/poseidon:latest'
+        image: 'iqtlabs/poseidon:v0.17.21'
         ports:
             - '9304:9304'
         environment:
@@ -62,12 +56,9 @@ services:
                 condition: service_healthy
             rabbitmq_adapter:
                 condition: service_started
-        build:
-            context: .
-            dockerfile: Dockerfile
     workers:
         restart: always
-        image: 'iqtlabs/poseidon-workers:latest'
+        image: 'iqtlabs/poseidon-workers:v0.17.21'
         environment:
             PYTHONUNBUFFERED: '1'
             KEEPIMAGES: '0'
@@ -79,9 +70,6 @@ services:
             - '/var/run/docker.sock:/var/run/docker.sock'
         depends_on:
             - poseidon
-        build:
-            context: workers
-            dockerfile: Dockerfile
 networks:
     poseidon:
         driver: overlay