diff --git a/cross/binutils-aarch64/APKBUILD b/cross/binutils-aarch64/APKBUILD
index f1196c5ce..ce067c4b3 100644
--- a/cross/binutils-aarch64/APKBUILD
+++ b/cross/binutils-aarch64/APKBUILD
@@ -12,8 +12,8 @@ depends=""
 makedepends_build=""
 makedepends_host=""
 makedepends="gettext libtool autoconf automake bison"
-arch="all"
-license="GPL2 GPL3+ LGPL2 BSD"
+arch="armhf x86_64"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages=""
 source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
 	binutils-ld-fix-static-linking.patch
diff --git a/cross/binutils-armhf/APKBUILD b/cross/binutils-armhf/APKBUILD
index 7e70f652b..7c70cf895 100644
--- a/cross/binutils-armhf/APKBUILD
+++ b/cross/binutils-armhf/APKBUILD
@@ -12,8 +12,8 @@ depends=""
 makedepends_build=""
 makedepends_host=""
 makedepends="gettext libtool autoconf automake bison"
-arch="all"
-license="GPL2 GPL3+ LGPL2 BSD"
+arch="aarch64 x86_64"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages=""
 source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
 	binutils-ld-fix-static-linking.patch
diff --git a/cross/binutils-x86_64/APKBUILD b/cross/binutils-x86_64/APKBUILD
index 2f57037b3..5bdbd76ea 100644
--- a/cross/binutils-x86_64/APKBUILD
+++ b/cross/binutils-x86_64/APKBUILD
@@ -12,7 +12,7 @@ depends=""
 makedepends_build=""
 makedepends_host=""
 makedepends="gettext libtool autoconf automake bison"
-arch="all"
+arch="armhf aarch64"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages=""
 source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD
index 1db7634de..1113d4993 100644
--- a/cross/gcc-aarch64/APKBUILD
+++ b/cross/gcc-aarch64/APKBUILD
@@ -57,7 +57,7 @@ pkgname="gcc-aarch64"
 pkgrel=6
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="http://gcc.gnu.org"
-arch="all"
+arch="armhf x86_64"
 license="GPL LGPL"
 _gccrel=$pkgver-r$pkgrel
 depends="isl binutils-aarch64"
diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD
index be3bb0479..0f666d6ca 100644
--- a/cross/gcc-armhf/APKBUILD
+++ b/cross/gcc-armhf/APKBUILD
@@ -57,7 +57,7 @@ pkgname="gcc-armhf"
 pkgrel=6
 pkgdesc="Stage2 cross-compiler for armhf"
 url="http://gcc.gnu.org"
-arch="all"
+arch="aarch64 x86_64"
 license="GPL LGPL"
 _gccrel=$pkgver-r$pkgrel
 depends="isl binutils-armhf"
diff --git a/cross/gcc-x86_64/APKBUILD b/cross/gcc-x86_64/APKBUILD
index ff383b760..5517af23a 100644
--- a/cross/gcc-x86_64/APKBUILD
+++ b/cross/gcc-x86_64/APKBUILD
@@ -57,7 +57,7 @@ pkgname="gcc-x86_64"
 pkgrel=6
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="http://gcc.gnu.org"
-arch="all"
+arch="armhf aarch64"
 license="GPL LGPL"
 _gccrel=$pkgver-r$pkgrel
 depends="isl binutils-x86_64"
diff --git a/cross/musl-aarch64/APKBUILD b/cross/musl-aarch64/APKBUILD
index 089387b96..d10727bf9 100644
--- a/cross/musl-aarch64/APKBUILD
+++ b/cross/musl-aarch64/APKBUILD
@@ -1,9 +1,10 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen musl-aarch64
 
-pkgname=musl-aarch64
-pkgver=1.1.18
+pkgname="musl-aarch64"
+pkgver="1.1.18"
 pkgrel=5
+arch="armhf x86_64"
 subpackages="musl-dev-aarch64:package_dev"
 
 _arch="aarch64"
@@ -11,7 +12,6 @@ _mirror="https://nl.alpinelinux.org/alpine/"
 
 url="https://musl-libc.org"
 license="MIT"
-arch="all"
 options="!check !strip"
 pkgdesc="the musl library (lib c) implementation for $_arch"
 
diff --git a/cross/musl-armhf/APKBUILD b/cross/musl-armhf/APKBUILD
index dc1459d4a..738a859ee 100644
--- a/cross/musl-armhf/APKBUILD
+++ b/cross/musl-armhf/APKBUILD
@@ -1,9 +1,10 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen musl-armhf
 
-pkgname=musl-armhf
-pkgver=1.1.18
+pkgname="musl-armhf"
+pkgver="1.1.18"
 pkgrel=5
+arch="aarch64 x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
 _arch="armhf"
@@ -11,7 +12,6 @@ _mirror="https://nl.alpinelinux.org/alpine/"
 
 url="https://musl-libc.org"
 license="MIT"
-arch="all"
 options="!check !strip"
 pkgdesc="the musl library (lib c) implementation for $_arch"
 
diff --git a/cross/musl-x86_64/APKBUILD b/cross/musl-x86_64/APKBUILD
index 9be07640e..aa237eec0 100644
--- a/cross/musl-x86_64/APKBUILD
+++ b/cross/musl-x86_64/APKBUILD
@@ -1,9 +1,10 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen musl-x86_64
 
-pkgname=musl-x86_64
-pkgver=1.1.18
+pkgname="musl-x86_64"
+pkgver="1.1.18"
 pkgrel=5
+arch="armhf aarch64"
 subpackages="musl-dev-x86_64:package_dev"
 
 _arch="x86_64"
@@ -11,7 +12,6 @@ _mirror="http://dl-cdn.alpinelinux.org/alpine/"
 
 url="https://musl-libc.org"
 license="MIT"
-arch="all"
 options="!check !strip"
 pkgdesc="the musl library (lib c) implementation for $_arch"