diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml
index 99c930430..03294dce6 100644
--- a/.github/workflows/build_packages.yaml
+++ b/.github/workflows/build_packages.yaml
@@ -283,7 +283,7 @@ jobs:
             --pkgtype "${PKGTYPE}" \
             --arch "${ARCH}" \
             --elixir "${IS_ELIXIR}" \
-            --builder "builder_to_be_ignored"
+            --builder "force_host"
         done
     - uses: actions/upload-artifact@v3
       if: success()
diff --git a/.github/workflows/build_packages_cron.yaml b/.github/workflows/build_packages_cron.yaml
index 2f8316825..86d44d512 100644
--- a/.github/workflows/build_packages_cron.yaml
+++ b/.github/workflows/build_packages_cron.yaml
@@ -95,7 +95,7 @@ jobs:
               --pkgtype "${PKGTYPE}" \
               --arch "${ARCH}" \
               --elixir "${IS_ELIXIR}" \
-              --builder "builder_to_be_ignored"
+              --builder "force_host"
           done
       - uses: actions/upload-artifact@v3
         if: success()
diff --git a/scripts/buildx.sh b/scripts/buildx.sh
index 5c3a65369..9376647c0 100755
--- a/scripts/buildx.sh
+++ b/scripts/buildx.sh
@@ -140,7 +140,7 @@ BUILDER_SYSTEM="$(echo "$BUILDER" | awk -F'-' '{print $NF}')"
 CMD_RUN="make ${MAKE_TARGET} && ./scripts/pkg-tests.sh ${MAKE_TARGET}"
 
 IS_NATIVE_SYSTEM='no'
-if [[ "$HOST_SYSTEM" = "$BUILDER_SYSTEM" ]]; then
+if [[ "$BUILDER_SYSTEM" == "force_host" ]] || [[ "$BUILDER_SYSTEM" == "$HOST_SYSTEM" ]]; then
     IS_NATIVE_SYSTEM='yes'
 fi