diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4e67d999..025ec6cb 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -29,7 +29,9 @@ jobs:
           ENVIRONMENT=${{ env.ENVIRONMENT }}
           echo "ENVIRONMENT=${ENVIRONMENT}" >> $GITHUB_OUTPUT
           echo "STACK_NAME=${ENVIRONMENT//./-}" >> $GITHUB_OUTPUT
-          python3 -c 'import json; data = json.load(open("mrs-developer.json")); print("VOLTO_VERSION=" + data["core"]["tag"] or 'latest')' >> $GITHUB_OUTPUT
+          python3 -c 'import json; data = json.load(open("mrs.developer.json")); print("VOLTO_VERSION=" + data["core"]["tag"] or 'latest')' >> $GITHUB_OUTPUT
+
+      - run: echo "${{ steps.vars.outputs.VOLTO_VERSION }}"
 
   release:
     runs-on: ubuntu-latest
@@ -74,7 +76,7 @@ jobs:
           build-args: |
             ADDON_NAME=@kitconcept/volto-light-theme
             ADDON_PATH=volto-light-theme
-            VOLTO_VERSION=${{ env.VOLTO_VERSION }}
+            VOLTO_VERSION=${{ needs.meta.outputs.VOLTO_VERSION }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: $${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/dockerfiles/Dockerfile
similarity index 95%
rename from Dockerfile
rename to dockerfiles/Dockerfile
index c903b71b..407c0005 100644
--- a/Dockerfile
+++ b/dockerfiles/Dockerfile
@@ -8,7 +8,7 @@ ARG ADDON_PATH
 ENV THEME='@kitconcept/volto-light-theme'
 
 # Copy helper.py as /setupAddon
-COPY helper.py /setupAddon
+COPY dockerfiles/helper.py /setupAddon
 
 # Copy addon code
 COPY --chown=node:node ./packages/${ADDON_PATH} /app/src/addons/${ADDON_PATH}/
diff --git a/helper.py b/dockerfiles/helper.py
old mode 100644
new mode 100755
similarity index 99%
rename from helper.py
rename to dockerfiles/helper.py
index c317a792..8e4add72
--- a/helper.py
+++ b/dockerfiles/helper.py
@@ -1,10 +1,12 @@
 #!/usr/bin/python3
 """Addon support for Volto."""
+from pathlib import Path
+from typing import Tuple
+
 import json
 import logging
 import os
-from pathlib import Path
-from typing import Tuple
+
 
 logger = logging.getLogger("Volto Helper")