diff --git a/release/package/amd-builders-v4.yml b/release/package/amd-builders-v4.yml
index 932ad3b5d..9ca932ac7 100644
--- a/release/package/amd-builders-v4.yml
+++ b/release/package/amd-builders-v4.yml
@@ -3,62 +3,62 @@ services:
   mgbuild_v4_amzn-2:
     build:
       context: amzn-2
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_v4_amzn-2"
-    args:
-      TOOLCHAIN_VERSION: "v4"
 
   mgbuild_v4_centos-7:
     build:
       context: centos-7
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_v4_centos-7"
-    args:
-      TOOLCHAIN_VERSION: "v4"
 
   mgbuild_v4_centos-9:
     build:
       context: centos-9
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_v4_centos-9"
-    args:
-      TOOLCHAIN_VERSION: "v4"
 
   mgbuild_v4_debian-10:
     build:
       context: debian-10
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_v4_debian-10"
-    args:
-      TOOLCHAIN_VERSION: "v4"
 
   mgbuild_v4_debian-11:
     build:
       context: debian-11
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_v4_debian-11"
-    args:
-      TOOLCHAIN_VERSION: "v4"
 
   mgbuild_v4_fedora-36:
     build:
       context: fedora-36
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_v4_fedora-36"
-    args:
-      TOOLCHAIN_VERSION: "v4"
 
   mgbuild_v4_ubuntu-18.04:
     build:
       context: ubuntu-18.04
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_v4_ubuntu-18.04"
-    args:
-      TOOLCHAIN_VERSION: "v4"
 
   mgbuild_v4_ubuntu-20.04:
     build:
       context: ubuntu-20.04
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_v4_ubuntu-20.04"
-    args:
-      TOOLCHAIN_VERSION: "v4"
 
   mgbuild_v4_ubuntu-22.04:
     build:
       context: ubuntu-22.04
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_v4_ubuntu-22.04"
-    args:
-      TOOLCHAIN_VERSION: "v4"
diff --git a/release/package/amd-builders-v5.yml b/release/package/amd-builders-v5.yml
index da8f757a5..bad91c6f2 100644
--- a/release/package/amd-builders-v5.yml
+++ b/release/package/amd-builders-v5.yml
@@ -3,69 +3,67 @@ services:
   mgbuild_v5_amzn-2:
     build:
       context: amzn-2
+      args:
+        TOOLCHAIN_VERSION: "v5"
     container_name: "mgbuild_v5_amzn-2"
-    args:
-      TOOLCHAIN_VERSION: "v5"
 
   mgbuild_v5_centos-7:
     build:
       context: centos-7
     container_name: "mgbuild_v5_centos-7"
-    args:
-      TOOLCHAIN_VERSION: "v5"
 
   mgbuild_v5_centos-9:
     build:
       context: centos-9
+      args:
+        TOOLCHAIN_VERSION: "v5"
     container_name: "mgbuild_v5_centos-9"
-    args:
-      TOOLCHAIN_VERSION: "v5"
 
   mgbuild_v5_debian-11:
     build:
       context: debian-11
+      args:
+        TOOLCHAIN_VERSION: "v5"
     container_name: "mgbuild_v5_debian-11"
-    args:
-      TOOLCHAIN_VERSION: "v5"
 
   mgbuild_v5_debian-12:
     build:
       context: debian-12
+      args:
+        TOOLCHAIN_VERSION: "v5"
     container_name: "mgbuild_v5_debian-12"
-    args:
-      TOOLCHAIN_VERSION: "v5"
 
   mgbuild_v5_fedora-38:
     build:
       context: fedora-38
+      args:
+        TOOLCHAIN_VERSION: "v5"
     container_name: "mgbuild_v5_fedora-38"
-    args:
-      TOOLCHAIN_VERSION: "v5"
 
   mgbuild_v5_fedora-39:
     build:
       context: fedora-39
+      args:
+        TOOLCHAIN_VERSION: "v5"
     container_name: "mgbuild_v5_fedora-39"
-    args:
-      TOOLCHAIN_VERSION: "v5"
 
   mgbuild_v5_rocky-9:
     build:
       context: rocky-9
+      args:
+        TOOLCHAIN_VERSION: "v5"
     container_name: "mgbuild_v5_rocky-9"
-    args:
-      TOOLCHAIN_VERSION: "v5"
 
   mgbuild_v5_ubuntu-20.04:
     build:
       context: ubuntu-20.04
+      args:
+        TOOLCHAIN_VERSION: "v5"
     container_name: "mgbuild_v5_ubuntu-20.04"
-    args:
-      TOOLCHAIN_VERSION: "v5"
 
   mgbuild_v5_ubuntu-22.04:
     build:
       context: ubuntu-22.04
+      args:
+        TOOLCHAIN_VERSION: "v5"
     container_name: "mgbuild_v5_ubuntu-22.04"
-    args:
-      TOOLCHAIN_VERSION: "v5"
diff --git a/release/package/arm-builders-v4.yml b/release/package/arm-builders-v4.yml
index 207ee61d5..5bba0c132 100644
--- a/release/package/arm-builders-v4.yml
+++ b/release/package/arm-builders-v4.yml
@@ -4,13 +4,13 @@ services:
   mgbuild_v4_debian-11-arm:
     build:
       context: debian-11-arm
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_v4_debian-11-arm"
-    args:
-      TOOLCHAIN_VERSION: "v4"
 
   mgbuild_v4_ubuntu_v4_22.04-arm:
     build:
       context: ubuntu-22.04-arm
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_v4_ubuntu-22.04-arm"
-    args:
-      TOOLCHAIN_VERSION: "v4"
diff --git a/release/package/arm-builders-v5.yml b/release/package/arm-builders-v5.yml
index 7ab57b2dc..65b29f5f3 100644
--- a/release/package/arm-builders-v5.yml
+++ b/release/package/arm-builders-v5.yml
@@ -4,9 +4,13 @@ services:
   debian-12-arm:
     build:
       context: debian-12-arm
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_debian-12-arm"
 
   ubuntu-22.04-arm:
     build:
       context: ubuntu-22.04-arm
+      args:
+        TOOLCHAIN_VERSION: "v4"
     container_name: "mgbuild_ubuntu-22.04-arm"