diff --git a/.github/workflows/build-ccpp.yaml b/.github/workflows/build-ccpp.yaml
index 077943833..4499de595 100644
--- a/.github/workflows/build-ccpp.yaml
+++ b/.github/workflows/build-ccpp.yaml
@@ -38,6 +38,11 @@ jobs:
         run: |
           docker run --rm --privileged torizon/binfmt
 
+          if ($env:PROJECT_ARCH -eq "arm64") { $env:TORIZON_ARCH = "aarch64" }
+          if ($env:PROJECT_ARCH -eq "armhf") { $env:TORIZON_ARCH = "armhf" }
+          echo "TORIZON_ARCH=$env:TORIZON_ARCH" | `
+            Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
           scripts/createFromTemplate.ps1 `
             $env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
             "${env:PROJECT_FOLDER}CITest" `
diff --git a/.github/workflows/build-debug-ccpp.yaml b/.github/workflows/build-debug-ccpp.yaml
index b3780cad8..6449900d7 100644
--- a/.github/workflows/build-debug-ccpp.yaml
+++ b/.github/workflows/build-debug-ccpp.yaml
@@ -35,6 +35,11 @@ jobs:
         run: |
           docker run --rm --privileged torizon/binfmt
 
+          if ($env:PROJECT_ARCH -eq "arm64") { $env:TORIZON_ARCH = "aarch64" }
+          if ($env:PROJECT_ARCH -eq "armhf") { $env:TORIZON_ARCH = "armhf" }
+          echo "TORIZON_ARCH=$env:TORIZON_ARCH" | `
+            Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
           scripts/createFromTemplate.ps1 `
             $env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
             "${env:PROJECT_FOLDER}CITest" `
diff --git a/.github/workflows/build-debug-python.yaml b/.github/workflows/build-debug-python.yaml
index 4339cf5d2..5b6c91a87 100644
--- a/.github/workflows/build-debug-python.yaml
+++ b/.github/workflows/build-debug-python.yaml
@@ -31,6 +31,11 @@ jobs:
         run: |
           docker run --rm --privileged torizon/binfmt
 
+          if ($env:PROJECT_ARCH -eq "arm64") { $env:TORIZON_ARCH = "aarch64" }
+          if ($env:PROJECT_ARCH -eq "armhf") { $env:TORIZON_ARCH = "armhf" }
+          echo "TORIZON_ARCH=$env:TORIZON_ARCH" | `
+            Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
           scripts/createFromTemplate.ps1 `
             $env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
             "${env:PROJECT_FOLDER}CITest" `
diff --git a/.github/workflows/build-debug-rust.yaml b/.github/workflows/build-debug-rust.yaml
index 8b8b8273e..0dec7a615 100644
--- a/.github/workflows/build-debug-rust.yaml
+++ b/.github/workflows/build-debug-rust.yaml
@@ -31,6 +31,11 @@ jobs:
         run: |
           docker run --rm --privileged torizon/binfmt
 
+          if ($env:PROJECT_ARCH -eq "arm64") { $env:TORIZON_ARCH = "aarch64" }
+          if ($env:PROJECT_ARCH -eq "armhf") { $env:TORIZON_ARCH = "armhf" }
+          echo "TORIZON_ARCH=$env:TORIZON_ARCH" | `
+            Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
           scripts/createFromTemplate.ps1 `
             $env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
             "${env:PROJECT_FOLDER}CITest" `
diff --git a/.github/workflows/build-python.yaml b/.github/workflows/build-python.yaml
index a1a5795b0..1e178b928 100644
--- a/.github/workflows/build-python.yaml
+++ b/.github/workflows/build-python.yaml
@@ -31,6 +31,7 @@ jobs:
 
         run: |
           docker run --rm --privileged torizon/binfmt
+
           if ($env:PROJECT_ARCH -eq "arm64") { $env:TORIZON_ARCH = "aarch64" }
           if ($env:PROJECT_ARCH -eq "armhf") { $env:TORIZON_ARCH = "armhf" }
           echo "TORIZON_ARCH=$env:TORIZON_ARCH" | `
diff --git a/.github/workflows/build-rust.yaml b/.github/workflows/build-rust.yaml
index f8e72b02d..75a3f05bb 100644
--- a/.github/workflows/build-rust.yaml
+++ b/.github/workflows/build-rust.yaml
@@ -32,6 +32,11 @@ jobs:
         run: |
           docker run --rm --privileged torizon/binfmt
 
+          if ($env:PROJECT_ARCH -eq "arm64") { $env:TORIZON_ARCH = "aarch64" }
+          if ($env:PROJECT_ARCH -eq "armhf") { $env:TORIZON_ARCH = "armhf" }
+          echo "TORIZON_ARCH=$env:TORIZON_ARCH" | `
+            Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
           scripts/createFromTemplate.ps1 `
             $env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
             "${env:PROJECT_FOLDER}CITest" `
diff --git a/scripts/torizonPackages.ps1 b/scripts/torizonPackages.ps1
index 7a6840537..ff101f40e 100644
--- a/scripts/torizonPackages.ps1
+++ b/scripts/torizonPackages.ps1
@@ -16,7 +16,7 @@
 )]
 param()
 
-$TORIZON_ARCH = "aarch64"
+$TORIZON_ARCH = $env:TORIZON_ARCH
 
 if ($TORIZON_ARCH -eq "aarch64") {
     $TORIZON_ARCH = "arm64"