diff --git a/.github/workflows/prod-cd.yaml b/.github/workflows/prod-cd.yaml
index a6b3cdb43..3f9483eff 100644
--- a/.github/workflows/prod-cd.yaml
+++ b/.github/workflows/prod-cd.yaml
@@ -16,19 +16,19 @@ jobs:
       API_WORKERS: 8
 
     steps:
-#       - name: Wait for tests to succeed
-#         uses: lewagon/wait-on-check-action@v1.0.0
-#         with:
-#           ref: ${{ github.ref }}
-#           repo-token: ${{ secrets.GITHUB_TOKEN }}
-#           check-name: pytest
-
-#       - name: Wait for lighthouse tests to succeed
-#         uses: lewagon/wait-on-check-action@v1.0.0
-#         with:
-#           ref: ${{ github.ref }}
-#           repo-token: ${{ secrets.GITHUB_TOKEN }}
-#           check-name: 'Lighthouse CI'
+      #       - name: Wait for tests to succeed
+      #         uses: lewagon/wait-on-check-action@v1.0.0
+      #         with:
+      #           ref: ${{ github.ref }}
+      #           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      #           check-name: pytest
+
+      #       - name: Wait for lighthouse tests to succeed
+      #         uses: lewagon/wait-on-check-action@v1.0.0
+      #         with:
+      #           ref: ${{ github.ref }}
+      #           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      #           check-name: 'Lighthouse CI'
 
       - uses: actions/checkout@v2
         with:
@@ -36,16 +36,16 @@ jobs:
 
       - name: Build images
         run: |
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml build yacs_api yacs_web
+          docker compose -f docker-compose.yml -f docker-compose.production.yml build yacs_api yacs_web
 
       - name: Update yacs_api
         run: |
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_api &&
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_api &&
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_api
+          docker compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_api &&
+          docker compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_api &&
+          docker compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_api
 
       - name: Update yacs_web
         run: |
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_web &&
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_web &&
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_web
+          docker compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_web &&
+          docker compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_web &&
+          docker compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_web
diff --git a/.github/workflows/staging.yaml b/.github/workflows/staging.yaml
index 5f8762e4a..168156a6c 100644
--- a/.github/workflows/staging.yaml
+++ b/.github/workflows/staging.yaml
@@ -23,16 +23,16 @@ jobs:
 
       - name: Build images
         run: |
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml build yacs_api yacs_web
+          docker compose -f docker-compose.yml -f docker-compose.production.yml build yacs_api yacs_web
 
       - name: Update yacs_api
         run: |
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_api &&
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_api &&
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_api
+          docker compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_api &&
+          docker compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_api &&
+          docker compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_api
 
       - name: Update yacs_web
         run: |
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_web &&
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_web &&
-          docker-compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_web
+          docker compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_web &&
+          docker compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_web &&
+          docker compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_web