diff --git a/tidepool/src/packages/foundation/bash/versions/5.2.15-bootstrap.nix b/tidepool/src/packages/foundation/bash/versions/5.2.15-bootstrap.nix
index a63bf8d..39a9742 100644
--- a/tidepool/src/packages/foundation/bash/versions/5.2.15-bootstrap.nix
+++ b/tidepool/src/packages/foundation/bash/versions/5.2.15-bootstrap.nix
@@ -13,13 +13,11 @@ in
       main = "/bin/bash";
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix
index da2e9c6..90ba4d9 100644
--- a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix
@@ -28,23 +28,11 @@ in
       main = "/bin/bash";
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix
index 20391a4..e894665 100644
--- a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix
+++ b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix
@@ -34,13 +34,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/binutils/versions/2.41-bootstrap.nix b/tidepool/src/packages/foundation/binutils/versions/2.41-bootstrap.nix
index e31d19a..06cf462 100644
--- a/tidepool/src/packages/foundation/binutils/versions/2.41-bootstrap.nix
+++ b/tidepool/src/packages/foundation/binutils/versions/2.41-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix
index 743341d..ed2a41b 100644
--- a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix
@@ -29,19 +29,9 @@ in
 
     platforms = [
       {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        build = "@linux";
+        host = "@build";
+        target = "@build";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix
index f5a6a21..db677ec 100644
--- a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix
+++ b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix
@@ -67,44 +67,14 @@ in
 
     platforms = [
       {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
+        build = "@linux";
+        host = "@build";
+        target = "@linux";
       }
       {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "i686-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "riscv64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        build = "@linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/bison/versions/3.8.2-bootstrap.nix b/tidepool/src/packages/foundation/bison/versions/3.8.2-bootstrap.nix
index 4a12cb2..6cf0aa2 100644
--- a/tidepool/src/packages/foundation/bison/versions/3.8.2-bootstrap.nix
+++ b/tidepool/src/packages/foundation/bison/versions/3.8.2-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1-passthrough.nix b/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1-passthrough.nix
index 4ddeaa1..d2dfaf2 100644
--- a/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1-passthrough.nix
@@ -25,13 +25,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-    ];
+    platforms = {
+      build = "x86_64-linux";
+      host = "x86_64-linux";
+      target = "x86_64-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix b/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix
index 67f13f7..638b9c1 100644
--- a/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix
+++ b/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix
@@ -25,13 +25,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "x86_64-linux";
+      target = "x86_64-linux";
+    };
 
     builder = builders.basic;
 
diff --git a/tidepool/src/packages/foundation/busybox/versions/1.36.1-bootstrap.nix b/tidepool/src/packages/foundation/busybox/versions/1.36.1-bootstrap.nix
index 68cff0b..281b7b2 100644
--- a/tidepool/src/packages/foundation/busybox/versions/1.36.1-bootstrap.nix
+++ b/tidepool/src/packages/foundation/busybox/versions/1.36.1-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl2Only;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-bootstrap.nix b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-bootstrap.nix
index 012516e..410d553 100644
--- a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-bootstrap.nix
+++ b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.bsdOriginal;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix
index e0ae93e..6b13f04 100644
--- a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix
@@ -27,23 +27,11 @@ in
       license = lib.licenses.bsdOriginal;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix
index 7be52de..acf43e5 100644
--- a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix
+++ b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix
@@ -17,9 +17,10 @@ let
     target = lib.systems.withBuildInfo config.platform.target;
   };
 
-  prefix = lib.strings.when (
-    platform.build.triple != platform.host.triple
-  ) "${platform.host.triple}-";
+  prefix = lib.strings.when
+    (
+      platform.build.triple != platform.host.triple
+    ) "${platform.host.triple}-";
 in
 {
   config = {
@@ -37,13 +38,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/coreutils/versions/9.4-bootstrap.nix b/tidepool/src/packages/foundation/coreutils/versions/9.4-bootstrap.nix
index a167f71..81d82c7 100644
--- a/tidepool/src/packages/foundation/coreutils/versions/9.4-bootstrap.nix
+++ b/tidepool/src/packages/foundation/coreutils/versions/9.4-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix
index 34b972f..d8ff677 100644
--- a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix
@@ -27,23 +27,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix
index fffa0a7..58aeb0e 100644
--- a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix
+++ b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix
@@ -17,9 +17,10 @@ let
     target = lib.systems.withBuildInfo config.platform.target;
   };
 
-  prefix = lib.strings.when (
-    platform.build.triple != platform.host.triple
-  ) "${platform.host.triple}-";
+  prefix = lib.strings.when
+    (
+      platform.build.triple != platform.host.triple
+    ) "${platform.host.triple}-";
 
   configureFlags = [
     "--prefix=${builtins.placeholder "out"}"
@@ -44,13 +45,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/diffutils/versions/3.10-bootstrap.nix b/tidepool/src/packages/foundation/diffutils/versions/3.10-bootstrap.nix
index 9ae0eec..8b3b527 100644
--- a/tidepool/src/packages/foundation/diffutils/versions/3.10-bootstrap.nix
+++ b/tidepool/src/packages/foundation/diffutils/versions/3.10-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Only;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix
index 9a69e7e..3ff73e0 100644
--- a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix
@@ -27,23 +27,11 @@ in
       license = lib.licenses.gpl3Only;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix
index 766900a..9d25b4e 100644
--- a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix
+++ b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix
@@ -33,13 +33,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/findutils/versions/4.9.0-bootstrap.nix b/tidepool/src/packages/foundation/findutils/versions/4.9.0-bootstrap.nix
index 4331d8a..add4319 100644
--- a/tidepool/src/packages/foundation/findutils/versions/4.9.0-bootstrap.nix
+++ b/tidepool/src/packages/foundation/findutils/versions/4.9.0-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix
index b2ea1e7..1ae4638 100644
--- a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix
@@ -29,19 +29,9 @@ in
 
     platforms = [
       {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        build = "@linux";
+        host = "@build";
+        target = "@build";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix
index fdee6e4..0227cbe 100644
--- a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix
+++ b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix
@@ -33,13 +33,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix
index 831e27d..e2eceba 100644
--- a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix
@@ -29,19 +29,9 @@ in
 
     platforms = [
       {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        build = "@linux";
+        host = "@build";
+        target = "@build";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix
index a5bd9eb..615ad86 100644
--- a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix
+++ b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix
@@ -33,13 +33,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix
index a7af20c..8ce26b6 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix
@@ -17,13 +17,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix
index 1b46137..8aa2b8d 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix
@@ -72,13 +72,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.basic;
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix
index d2957fe..db4012c 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix
@@ -18,9 +18,10 @@ let
     target = lib.systems.withBuildInfo config.platform.target;
   };
 
-  prefix = lib.strings.when (
-    platform.build.triple != platform.target.triple
-  ) "${platform.target.triple}-";
+  prefix = lib.strings.when
+    (
+      platform.build.triple != platform.target.triple
+    ) "${platform.target.triple}-";
 
   patches = [
     ../patches/libstdc++-target.patch
@@ -93,12 +94,7 @@ in
       {
         build = "x86_64-linux";
         host = "x86_64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "riscv64-linux";
+        target = "@linux";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix
index 0691b89..429f847 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix
@@ -18,9 +18,10 @@ let
     target = lib.systems.withBuildInfo config.platform.target;
   };
 
-  prefix = lib.strings.when (
-    platform.build.triple != platform.target.triple
-  ) "${platform.target.triple}-";
+  prefix = lib.strings.when
+    (
+      platform.build.triple != platform.target.triple
+    ) "${platform.target.triple}-";
 
   patches = [
     ../patches/libstdc++-target.patch
@@ -88,12 +89,7 @@ in
       {
         build = "x86_64-linux";
         host = "x86_64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "riscv64-linux";
+        target = "@linux";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix
index 1d1a1b0..cf29080 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix
@@ -28,23 +28,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix
index 05025c5..0244499 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix
@@ -18,9 +18,10 @@ let
     target = lib.systems.withBuildInfo config.platform.target;
   };
 
-  prefix = lib.strings.when (
-    platform.build.triple != platform.target.triple
-  ) "${platform.target.triple}-";
+  prefix = lib.strings.when
+    (
+      platform.build.triple != platform.target.triple
+    ) "${platform.target.triple}-";
 
   patches = [
     ../patches/libstdc++-target.patch
@@ -88,13 +89,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix
index fe06412..88768af 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix
@@ -75,23 +75,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.basic;
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage5.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage5.nix
index 2c074e3..168e5b6 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage5.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage5.nix
@@ -13,15 +13,17 @@ let
     if
       config.platform.build == config.platform.host && config.platform.host != config.platform.target
     then
-      packages.foundation.gcc.versions."13.2.0-stage2".extend {
-        platform = lib.modules.overrides.force config.platform;
-      }
+      packages.foundation.gcc.versions."13.2.0-stage2".extend
+        {
+          platform = lib.modules.overrides.force config.platform;
+        }
     else if
       config.platform.build != config.platform.host && config.platform.host == config.platform.target
     then
-      packages.foundation.gcc.versions."13.2.0-stage3".extend {
-        platform = lib.modules.overrides.force config.platform;
-      }
+      packages.foundation.gcc.versions."13.2.0-stage3".extend
+        {
+          platform = lib.modules.overrides.force config.platform;
+        }
     else
       packages.foundation.gcc.versions."13.2.0-stage4".extend {
         platform = lib.modules.overrides.force config.platform;
@@ -37,34 +39,14 @@ in
 
     platforms = [
       {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
+        build = "@linux";
+        host = "@build";
+        target = "@build";
       }
       {
         build = "x86_64-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "riscv64-linux";
+        target = "@linux";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix b/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix
index 748d141..174f7a8 100644
--- a/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix
+++ b/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix
@@ -32,13 +32,11 @@ in
       license = lib.licenses.lgpl2Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.basic;
 
diff --git a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix
index cfc5409..36c9ed8 100644
--- a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix
@@ -35,23 +35,11 @@ in
       license = lib.licenses.lgpl2Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     dynamicLinker = package.dynamicLinker;
 
diff --git a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix
index fb72a44..3ff75ef 100644
--- a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix
+++ b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix
@@ -41,13 +41,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gnugrep/versions/3.11-bootstrap.nix b/tidepool/src/packages/foundation/gnugrep/versions/3.11-bootstrap.nix
index d9251cc..e53c36d 100644
--- a/tidepool/src/packages/foundation/gnugrep/versions/3.11-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnugrep/versions/3.11-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix
index d3ac739..519c785 100644
--- a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix
@@ -27,23 +27,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix
index 105565e..654800d 100644
--- a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix
+++ b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix
@@ -33,13 +33,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-bootstrap.nix b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-bootstrap.nix
index 8d30050..04b76ff 100644
--- a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1-passthrough.nix
index eb0c54c..76b96b1 100644
--- a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1-passthrough.nix
@@ -25,13 +25,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-    ];
+    platforms = {
+      build = "x86_64-linux";
+      host = "x86_64-linux";
+      target = "x86_64-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix
index a29eca1..659fe6d 100644
--- a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix
+++ b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix
@@ -25,13 +25,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "x86_64-linux";
+      target = "x86_64-linux";
+    };
 
     builder = builders.basic;
 
diff --git a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-bootstrap.nix b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-bootstrap.nix
index 2d3d932..e8329d6 100644
--- a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix
index 1475922..0303dab 100644
--- a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix
@@ -27,23 +27,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix
index c268399..bfdd94f 100644
--- a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix
+++ b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix
@@ -38,13 +38,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gnupatch/versions/2.7-bootstrap.nix b/tidepool/src/packages/foundation/gnupatch/versions/2.7-bootstrap.nix
index 82bf587..f61fd14 100644
--- a/tidepool/src/packages/foundation/gnupatch/versions/2.7-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnupatch/versions/2.7-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix
index 4cecae7..ad0c76f 100644
--- a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix
@@ -27,23 +27,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix
index fd0988d..6ed7966 100644
--- a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix
+++ b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix
@@ -33,13 +33,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gnused/versions/4.9-bootstrap.nix b/tidepool/src/packages/foundation/gnused/versions/4.9-bootstrap.nix
index 542853f..b2113fd 100644
--- a/tidepool/src/packages/foundation/gnused/versions/4.9-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnused/versions/4.9-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix
index 04db097..e8b389e 100644
--- a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix
@@ -27,23 +27,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix
index 2d4445b..aaabd1f 100644
--- a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix
+++ b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix
@@ -33,13 +33,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gnutar/versions/1.35-bootstrap.nix b/tidepool/src/packages/foundation/gnutar/versions/1.35-bootstrap.nix
index 02aaccd..6165d20 100644
--- a/tidepool/src/packages/foundation/gnutar/versions/1.35-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnutar/versions/1.35-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix
index e45d75f..2f6003b 100644
--- a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix
@@ -27,23 +27,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix
index 34a5a39..d4a2751 100644
--- a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix
+++ b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix
@@ -33,13 +33,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gzip/versions/1.13-bootstrap.nix b/tidepool/src/packages/foundation/gzip/versions/1.13-bootstrap.nix
index 0c603c4..0fe1459 100644
--- a/tidepool/src/packages/foundation/gzip/versions/1.13-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gzip/versions/1.13-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix
index bffb0bd..cd895b5 100644
--- a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix
@@ -27,23 +27,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix
index a2d2dd0..9f87d7a 100644
--- a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix
+++ b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix
@@ -32,14 +32,14 @@ in
         target = "x86_64-linux";
       }
       {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
+        build = "x86_64-linux";
+        host = "@linux";
+        target = "@host";
       }
       {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        build = "@linux";
+        host = "@build";
+        target = "@build";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-bootstrap.nix b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-bootstrap.nix
index 2ecf421..638804d 100644
--- a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-bootstrap.nix
+++ b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-bootstrap.nix
@@ -11,13 +11,11 @@ in
       license = lib.licenses.lgpl2Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix
index de14449..f7f3d91 100644
--- a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix
@@ -19,23 +19,11 @@ in
       license = lib.licenses.lgpl2Plus;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix
index fa6acd6..63ff008 100644
--- a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix
+++ b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix
@@ -19,28 +19,11 @@ in
       license = lib.licenses.lgpl2Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@linux";
+    };
 
     builder = builders.basic;
 
diff --git a/tidepool/src/packages/foundation/musl/versions/1.2.4-bootstrap.nix b/tidepool/src/packages/foundation/musl/versions/1.2.4-bootstrap.nix
index 991de0a..234ad05 100644
--- a/tidepool/src/packages/foundation/musl/versions/1.2.4-bootstrap.nix
+++ b/tidepool/src/packages/foundation/musl/versions/1.2.4-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.mit;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/musl/versions/1.2.4.nix b/tidepool/src/packages/foundation/musl/versions/1.2.4.nix
index ccb4ac0..1c90698 100644
--- a/tidepool/src/packages/foundation/musl/versions/1.2.4.nix
+++ b/tidepool/src/packages/foundation/musl/versions/1.2.4.nix
@@ -18,18 +18,11 @@ in
       license = lib.licenses.mit;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "x86_64-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = [ "i686-linux" "x86_64-linux" ];
+    };
 
     builder = builders.basic;
 
diff --git a/tidepool/src/packages/foundation/patchelf/versions/0.18.0-bootstrap.nix b/tidepool/src/packages/foundation/patchelf/versions/0.18.0-bootstrap.nix
index 10c30fd..447c2e2 100644
--- a/tidepool/src/packages/foundation/patchelf/versions/0.18.0-bootstrap.nix
+++ b/tidepool/src/packages/foundation/patchelf/versions/0.18.0-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/python/versions/3.12.0-bootstrap.nix b/tidepool/src/packages/foundation/python/versions/3.12.0-bootstrap.nix
index 39a53df..e411071 100644
--- a/tidepool/src/packages/foundation/python/versions/3.12.0-bootstrap.nix
+++ b/tidepool/src/packages/foundation/python/versions/3.12.0-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.psfl;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix b/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix
index b9359bd..e06b0a2 100644
--- a/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix
+++ b/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix
@@ -29,23 +29,11 @@ in
       license = lib.licenses.psfl;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.basic;
 
@@ -98,7 +86,7 @@ in
         bash ./configure \
           --prefix=$out \
           --build=${platform.build.triple} \
-          --host=${platform.host.triple} 
+          --host=${platform.host.triple}
       '';
 
       build = ''
diff --git a/tidepool/src/packages/foundation/xz/versions/5.4.3-bootstrap.nix b/tidepool/src/packages/foundation/xz/versions/5.4.3-bootstrap.nix
index c32b9aa..d507756 100644
--- a/tidepool/src/packages/foundation/xz/versions/5.4.3-bootstrap.nix
+++ b/tidepool/src/packages/foundation/xz/versions/5.4.3-bootstrap.nix
@@ -15,13 +15,11 @@ in
       ];
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix
index 760a435..94c725c 100644
--- a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix
@@ -30,23 +30,11 @@ in
       ];
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix
index 2b8ca78..99be43a 100644
--- a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix
+++ b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix
@@ -36,13 +36,8 @@ in
       }
       {
         build = "x86_64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "x86_64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
+        host = "@linux";
+        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/zlib/versions/1.3-bootstrap.nix b/tidepool/src/packages/foundation/zlib/versions/1.3-bootstrap.nix
index 8a04caf..18438cb 100644
--- a/tidepool/src/packages/foundation/zlib/versions/1.3-bootstrap.nix
+++ b/tidepool/src/packages/foundation/zlib/versions/1.3-bootstrap.nix
@@ -12,13 +12,11 @@ in
       license = lib.licenses.zlib;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms = {
+      build = "i686-linux";
+      host = "i686-linux";
+      target = "i686-linux";
+    };
 
     builder = builders.passthrough.extend {
       settings = {
diff --git a/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix b/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix
index 79e9620..fa91fd0 100644
--- a/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix
+++ b/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix
@@ -25,23 +25,11 @@ in
       license = lib.licenses.zlib;
     };
 
-    platforms = [
-      {
-        build = "x86_64-linux";
-        host = "x86_64-linux";
-        target = "x86_64-linux";
-      }
-      {
-        build = "aarch64-linux";
-        host = "aarch64-linux";
-        target = "aarch64-linux";
-      }
-      {
-        build = "riscv64-linux";
-        host = "riscv64-linux";
-        target = "riscv64-linux";
-      }
-    ];
+    platforms = {
+      build = "@linux";
+      host = "@build";
+      target = "@build";
+    };
 
     builder = builders.basic;