diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index af93ea3fa..69fa36ecf 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -43,6 +43,7 @@ jobs:
             type=sha,format=long
             type=ref,event=branch
             type=ref,event=tag
+            type=raw,value=${{ github.event.inputs.environment }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
diff --git a/docker-compose-local.yaml b/docker-compose-local.yaml
index 6de545acb..ff29a0c62 100644
--- a/docker-compose-local.yaml
+++ b/docker-compose-local.yaml
@@ -17,7 +17,8 @@ services:
       - host.docker.internal:host-gateway
 
   beyond-the-loop:
-    image: ghcr.io/philszalay/beyond-the-loop:main
+    image: ghcr.io/philszalay/beyond-the-loop:production
+    pull_policy: always
     container_name: beyond-the-loop
     env_file:
       - .env
diff --git a/docker-compose-prod.yaml b/docker-compose-prod.yaml
index b5be312fc..8f45d44d5 100644
--- a/docker-compose-prod.yaml
+++ b/docker-compose-prod.yaml
@@ -16,7 +16,8 @@ services:
       - host.docker.internal:host-gateway
 
   beyond-the-loop:
-    image: ghcr.io/philszalay/beyond-the-loop:main
+    image: ghcr.io/philszalay/beyond-the-loop:production
+    pull_policy: always
     container_name: beyond-the-loop
     env_file:
       - .env
diff --git a/docker-compose-staging.yaml b/docker-compose-staging.yaml
index f4b4795c8..26de8e6e6 100644
--- a/docker-compose-staging.yaml
+++ b/docker-compose-staging.yaml
@@ -17,6 +17,7 @@ services:
 
   beyond-the-loop:
     image: ghcr.io/philszalay/beyond-the-loop:staging
+    pull_policy: always
     container_name: beyond-the-loop
     env_file:
       - .env