diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
index fb2aed3fc..4aac37614 100644
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -44,6 +44,8 @@ jobs:
       SSH_PRIVATE_KEY: ${{ secrets.NIX_REMOTE_BUILD_ARM_SSH_KEY }}
       NIX_CACHE_PUB_KEY: ${{ secrets.NIX_CACHE_PUB_KEY }}
       NIX_CACHE_PRIV_KEY: ${{ secrets.NIX_CACHE_PRIV_KEY }}
+      NIX_REMOTE_BUILDER_SECURITY_GROUP_ID: ${{ secrets.NIX_REMOTE_BUILDER_SECURITY_GROUP_ID }}
+      NIX_REMOTE_BUILDER_SUBNET_ID: ${{ secrets.NIX_REMOTE_BUILDER_SUBNET_ID }}
 
   remove_label:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 66945e9e2..aed429890 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -26,6 +26,8 @@ jobs:
       SSH_PRIVATE_KEY: ${{ secrets.NIX_REMOTE_BUILD_ARM_SSH_KEY }}
       NIX_CACHE_PUB_KEY: ${{ secrets.NIX_CACHE_PUB_KEY }}
       NIX_CACHE_PRIV_KEY: ${{ secrets.NIX_CACHE_PRIV_KEY }}
+      NIX_REMOTE_BUILDER_SECURITY_GROUP_ID: ${{ secrets.NIX_REMOTE_BUILDER_SECURITY_GROUP_ID }}
+      NIX_REMOTE_BUILDER_SUBNET_ID: ${{ secrets.NIX_REMOTE_BUILDER_SUBNET_ID }}
 
   push_docker_image:
     uses: ./.github/workflows/wf_docker_push_image.yaml
diff --git a/.github/workflows/wf_build_artifacts.yaml b/.github/workflows/wf_build_artifacts.yaml
index 7a7fbf731..ff9f9db52 100644
--- a/.github/workflows/wf_build_artifacts.yaml
+++ b/.github/workflows/wf_build_artifacts.yaml
@@ -27,6 +27,10 @@ on:
         required: true
       NIX_CACHE_PRIV_KEY:
         required: true
+      NIX_REMOTE_BUILDER_SECURITY_GROUP_ID:
+        required: true
+      NIX_REMOTE_BUILDER_SUBNET_ID:
+        required: true
 
 jobs:
   artifacts:
@@ -82,15 +86,16 @@ jobs:
         echo BUILD_NEEDED=$BUILD_NEEDED >> $GITHUB_OUTPUT
 
     - name: "Setup nix-remote-builder"
-      uses: dbarrosop/nix-remote-builder-aws@v0.4.0
+      uses: dbarrosop/nix-remote-builder-aws@v0.5.0
       id: nix-remote-builder
       with:
         name: ${{ inputs.NAME }}-${{ inputs.GIT_REF }}
         ami: " ami-034dac72b37504107"
         instance-type: 't4g.xlarge'
         region: "eu-central-1"
-        availability-zone: "eu-central-1c"
         ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+        security-group-id: "{{ secrets.NIX_REMOTE_BUILDER_SECURITY_GROUP_ID }}"
+        subnet-id: "{{ secrets.NIX_REMOTE_BUILDER_SUBNET_ID }}"
       if: ${{ ( matrix.platform == 'aarch64' ) && steps.verify-build.outputs.BUILD_NEEDED == 'yes' }}
 
     - name: "Setup nix-remote-builder in nix.conf"