diff --git a/.github/workflows/deploy-bdjuno-public-testnet.yml b/.github/workflows/deploy-bdjuno-public-testnet.yml
index c7fdf0651..a079762df 100644
--- a/.github/workflows/deploy-bdjuno-public-testnet.yml
+++ b/.github/workflows/deploy-bdjuno-public-testnet.yml
@@ -18,6 +18,17 @@ jobs:
 #      - name: Set up Docker
 #        uses: docker/setup-buildx-action@v1
 
+      - name: Stop and remove any existing containers
+        run: |
+          sudo docker stop deploy_bdjuno_hasura_1 || true
+          sudo docker rm deploy_bdjuno_hasura_1 || true
+          sudo docker stop deploy_bdjuno_bdjuno_1 || true
+          sudo docker rm  deploy_bdjuno_bdjuno_1 || true
+          sudo docker stop deploy_bdjuno_hasura-actions_1 || true
+          sudo docker rm  deploy_bdjuno_hasura-actions_1 || true
+          sudo docker stop cloudsql-proxy || true
+          sudo docker rm cloudsql-proxy || true
+
       - name: Create bdjuno directory and download genesis file
         run: |
           mkdir bdjuno