diff --git a/.github/workflows/rpi_aarch64_image_builder.yml b/.github/workflows/rpi_aarch64_image_builder.yml
index 73e6111..45d7a04 100644
--- a/.github/workflows/rpi_aarch64_image_builder.yml
+++ b/.github/workflows/rpi_aarch64_image_builder.yml
@@ -11,17 +11,16 @@ jobs:
     env:
       INSTALL_REQUIREMENTS: false
       LOOP_IMAGE_SIZE: 4G
-      IMAGE_NAME_PREFIX: sz-arch
       DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
       TRANSFERSH_URL: ${{ secrets.TRANSFERSH_URL }}
-      RPI_MODEL: 5
       ARM_VERSION: aarch64
-      DEFAULT_LOCALE: en_US.UTF-8
-      TIMEZONE: Europe/Paris
-      KEYMAP: us-acentos
-      SSH_PUB_KEY: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMidTQ6KGfZtonNKd1HtNPPDiPtzEmlg5yOduvmZzTA valerius laptop
-      PACKAGES: arp-scan base-devel dosfstools git mkinitcpio-utils neovim nftables openssh python qrencode rsync sudo tailscale uboot-tools unzip zerotier-one zsh
-
+      # IMAGE_NAME_PREFIX: sz-arch
+      # RPI_MODEL: 5
+      # DEFAULT_LOCALE: en_US.UTF-8
+      # TIMEZONE: Europe/Paris
+      # KEYMAP: us-acentos
+      # SSH_PUB_KEY: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMidTQ6KGfZtonNKd1HtNPPDiPtzEmlg5yOduvmZzTA valerius laptop
+      # PACKAGES: arp-scan base-devel dosfstools git mkinitcpio-utils neovim nftables openssh python qrencode rsync sudo tailscale uboot-tools unzip zerotier-one zsh
     runs-on: self-hosted
     environment: main
     # container: archlinux:latest
@@ -29,6 +28,17 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Load Environment Variables
+      run: |
+        set -a
+        source build_config.env
+        set +a
+        while IFS= read -r line; do
+          if [[ "$line" =~ ^[[:alnum:]_]+=.+ ]]; then
+            echo "$line" >> $GITHUB_ENV
+          fi
+        done < build_config.env
+
     - name: Generate Dynamic Variables
       run: |
         echo "RPI_HOSTNAME=sz-$(git rev-parse --short HEAD)-rpi${{ env.RPI_MODEL }}" >> $GITHUB_ENV
diff --git a/build_archlinux_rpi_aarch64_img.sh b/build_archlinux_rpi_aarch64_img.sh
index 24081b5..2f49e5a 100755
--- a/build_archlinux_rpi_aarch64_img.sh
+++ b/build_archlinux_rpi_aarch64_img.sh
@@ -21,9 +21,6 @@ ICAgIHxfX18vICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK" | base64 -d
 
 source ./build_config.env
 
-printenv
-echo "here is the workdir - $WORKDIR_BASE"
-
 echo "Setting locale and keymap..."
 # Add locales to /etc/locale.gen within the chroot environment
 arch-chroot $WORKDIR_BASE/root sed -i -e '/^#en_US.UTF-8 UTF-8/s/^#//' \
diff --git a/build_config.env b/build_config.env
index 2861c3e..b6a43db 100644
--- a/build_config.env
+++ b/build_config.env
@@ -1,5 +1,6 @@
 
 # Build configuration
+IMAGE_NAME_PREFIX="sz-arch"
 DEFAULT_LOCALE="en_US.UTF-8"
 KEYMAP="us-accentos"
 TIMEZONE="Euripe/Paris"