diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 10addfb..b2e6d45 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -43,7 +43,7 @@ jobs:
           CLIENT_CREDENTIALS_JSON=${{ secrets.CLIENT_CREDENTIALS_JSON }}
           GOOGLE_CLIENT_SECRET=${{ secrets.GOOGLE_CLIENT_SECRET }}
           GOOGLE_CLIENT_ID=${{ secrets.GOOGLE_CLIENT_ID }}
-          PORT=${{ (github.event_name == 'pull_request' || github.ref == 'refs/heads/main') && env.DEV_BACKEND_PORT || env.PROD_BACKEND_PORT }}
+          PORT=${{ github.event_name != 'pull_request' && env.PROD_BACKEND_PORT || env.DEV_BACKEND_PORT }}
           
   frontend-build:
     runs-on: ubuntu-latest
@@ -70,4 +70,4 @@ jobs:
         tags: |
           themanwholikestocode/archive-me-prod:frontend-${{ github.event_name == 'pull_request' || github.ref == 'refs/heads/main' && 'development' || 'production' }}
         build-args: |
-          PORT=${{ github.event_name == 'pull_request' || github.ref == 'refs/heads/main' && env.DEV_FRONTEND_PORT || env.PROD_FRONTEND_PORT }}
+          PORT=${{ github.event_name != 'pull_request' && env.PROD_FRONTEND_PORT || env.DEV_FRONTEND_PORT }}