diff --git a/tidepool/src/lib/platforms.nix b/tidepool/src/lib/platforms.nix
index 047796d..c663cfc 100644
--- a/tidepool/src/lib/platforms.nix
+++ b/tidepool/src/lib/platforms.nix
@@ -62,7 +62,7 @@ in
                     host = if host == "@build" then build else host;
                     target =
                       if target == "@host" then
-                        host
+                        if host == "@build" then build else host
                       else if target == "@build" then
                         build
                       else
@@ -80,8 +80,6 @@ in
       spec: value:
       if builtins.isList value then
         builtins.concatMap (system: lib.platforms.expand spec system) value
-      else if value == "@build" then
-        lib.platforms.expand spec spec.build
       else if value == "@build" || value == "@host" then
         [ value ]
       else if lib.strings.hasPrefix "@" value then
diff --git a/tidepool/src/lib/types.nix b/tidepool/src/lib/types.nix
index 039a21f..f74f8b5 100644
--- a/tidepool/src/lib/types.nix
+++ b/tidepool/src/lib/types.nix
@@ -319,16 +319,19 @@ in
               build = lib.options.create {
                 description = "The build platform for the package.";
                 type = lib.types.string;
+                default.value = "@all";
               };
 
               host = lib.options.create {
                 description = "The host platform for the package.";
                 type = lib.types.string;
+                default.value = "@build";
               };
 
               target = lib.options.create {
                 description = "The target platform for the package.";
                 type = lib.types.string;
+                default.value = "@host";
               };
             };
           }
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 038bc41..8f551e8 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,11 +13,7 @@ in
       main = "/bin/bash";
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 cfc1257..0d58cef 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
@@ -26,11 +26,7 @@ in
       main = "/bin/bash";
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 7d53d5f..c08eaa5 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
@@ -29,12 +29,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 a7ffd4b..0fbb0f8 100644
--- a/tidepool/src/packages/foundation/binutils/versions/2.41-bootstrap.nix
+++ b/tidepool/src/packages/foundation/binutils/versions/2.41-bootstrap.nix
@@ -12,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 9da4e3f..71bf739 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
@@ -25,13 +25,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "@linux";
-        host = "@build";
-        target = "@build";
-      }
-    ];
+    platforms.build = "@linux";
 
     builder = builders.foundation.passthrough.extend {
       settings = {
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 7af5e22..cd439fc 100644
--- a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix
+++ b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix
@@ -67,13 +67,11 @@ in
     platforms = [
       {
         build = "@linux";
-        host = "@build";
         target = "@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 ba4e9f9..56bd2dd 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,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 d89dd31..c223d46 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
@@ -23,11 +23,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "x86_64-linux";
-      host = "x86_64-linux";
-      target = "x86_64-linux";
-    };
+    platforms.build = "x86_64-linux";
 
     builder = builders.foundation.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 73807fd..736385c 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
@@ -27,7 +27,6 @@ in
     platforms = {
       build = "i686-linux";
       host = "x86_64-linux";
-      target = "x86_64-linux";
     };
 
     builder = builders.foundation.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 850b041..4dd96d4 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,11 +12,7 @@ in
       license = lib.licenses.gpl2Only;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 958d967..92522cc 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,11 +12,7 @@ in
       license = lib.licenses.bsdOriginal;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 c6ee36f..b6b1fda 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
@@ -25,11 +25,7 @@ in
       license = lib.licenses.bsdOriginal;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 8e68f86..bb5251a 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
@@ -31,12 +31,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 cab88c4..deb9704 100644
--- a/tidepool/src/packages/foundation/coreutils/versions/9.4-bootstrap.nix
+++ b/tidepool/src/packages/foundation/coreutils/versions/9.4-bootstrap.nix
@@ -12,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 68d1629..5f9b9dd 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
@@ -25,11 +25,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 42b2609..d99aab6 100644
--- a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix
+++ b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix
@@ -35,12 +35,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 70761f5..09e5698 100644
--- a/tidepool/src/packages/foundation/diffutils/versions/3.10-bootstrap.nix
+++ b/tidepool/src/packages/foundation/diffutils/versions/3.10-bootstrap.nix
@@ -12,11 +12,7 @@ in
       license = lib.licenses.gpl3Only;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 1a65121..6a3100e 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
@@ -25,11 +25,7 @@ in
       license = lib.licenses.gpl3Only;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 41ea582..022dee0 100644
--- a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix
+++ b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix
@@ -28,12 +28,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 28459cf..4e0c703 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,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 0b5f6ae..bfd8982 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
@@ -25,13 +25,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "@linux";
-        host = "@build";
-        target = "@build";
-      }
-    ];
+    platforms.build = "@linux";
 
     builder = builders.foundation.passthrough.extend {
       settings = {
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 37b10e4..905eba1 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
@@ -28,12 +28,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-linux";
         host = "@linux";
-        target = "@host";
       }
     ];
 
diff --git a/tidepool/src/packages/foundation/gawk/versions/5.2.2-bootstrap.nix b/tidepool/src/packages/foundation/gawk/versions/5.2.2-bootstrap.nix
index a0ba4b5..3dd9c19 100644
--- a/tidepool/src/packages/foundation/gawk/versions/5.2.2-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gawk/versions/5.2.2-bootstrap.nix
@@ -12,13 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "i686-linux";
-        host = "i686-linux";
-        target = "i686-linux";
-      }
-    ];
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.passthrough.extend {
       settings = {
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 c9678dd..3709c5c 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
@@ -25,13 +25,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = [
-      {
-        build = "@linux";
-        host = "@build";
-        target = "@build";
-      }
-    ];
+    platforms.build = "@linux";
 
     builder = builders.foundation.passthrough.extend {
       settings = {
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 94acfe8..f054ad6 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
@@ -28,12 +28,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 1a9ffd5..54c1062 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
@@ -15,11 +15,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 813dbab..414991c 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
@@ -71,11 +71,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 8117aea..576765c 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
@@ -86,12 +86,10 @@ in
     platforms = [
       {
         build = "i686-linux";
-        host = "i686-linux";
         target = "x86_64-linux";
       }
       {
         build = "x86_64-linux";
-        host = "x86_64-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 b392e16..ff5741f 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
@@ -81,12 +81,10 @@ in
     platforms = [
       {
         build = "i686-linux";
-        host = "i686-linux";
         target = "x86_64-linux";
       }
       {
         build = "x86_64-linux";
-        host = "x86_64-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 95d7210..5cb5b05 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
@@ -26,11 +26,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 fbf2769..aa34d28 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
@@ -83,12 +83,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 d3f0f89..70ea098 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
@@ -74,11 +74,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 067e3b7..5c535a4 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
@@ -36,12 +36,9 @@ in
     platforms = [
       {
         build = "@linux";
-        host = "@build";
-        target = "@build";
       }
       {
         build = "x86_64-linux";
-        host = "x86_64-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 a0e86a7..25f0cd7 100644
--- a/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix
+++ b/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix
@@ -31,11 +31,7 @@ in
       license = lib.licenses.lgpl2Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 a766f71..546a104 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
@@ -33,11 +33,7 @@ in
       license = lib.licenses.lgpl2Plus;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     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 56d0bb7..1c980df 100644
--- a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix
+++ b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix
@@ -36,12 +36,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 be4b61a..969c992 100644
--- a/tidepool/src/packages/foundation/gnugrep/versions/3.11-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnugrep/versions/3.11-bootstrap.nix
@@ -12,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 1b3ef9c..1d5a51a 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
@@ -25,11 +25,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 b274787..a20b012 100644
--- a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix
+++ b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix
@@ -28,12 +28,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 2628d99..eb34528 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,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 d678ae4..4657dd5 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
@@ -23,11 +23,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "x86_64-linux";
-      host = "x86_64-linux";
-      target = "x86_64-linux";
-    };
+    platforms.build = "x86_64-linux";
 
     builder = builders.foundation.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 69181fc..51432cc 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
@@ -27,7 +27,6 @@ in
     platforms = {
       build = "i686-linux";
       host = "x86_64-linux";
-      target = "x86_64-linux";
     };
 
     builder = builders.foundation.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 1bd28b6..1e70f0a 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,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 fc24360..1781595 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
@@ -25,11 +25,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 b51af13..e7833a5 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
@@ -33,12 +33,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 d4c3f13..222263c 100644
--- a/tidepool/src/packages/foundation/gnupatch/versions/2.7-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnupatch/versions/2.7-bootstrap.nix
@@ -12,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 3a9089a..23595c6 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
@@ -25,11 +25,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 70c07a9..24c5ead 100644
--- a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix
+++ b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix
@@ -28,12 +28,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 b49080d..d728c04 100644
--- a/tidepool/src/packages/foundation/gnused/versions/4.9-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnused/versions/4.9-bootstrap.nix
@@ -12,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 9e778bc..b2e08eb 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
@@ -25,11 +25,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 f893802..e2db810 100644
--- a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix
+++ b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix
@@ -28,12 +28,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 20452dc..15d5da9 100644
--- a/tidepool/src/packages/foundation/gnutar/versions/1.35-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnutar/versions/1.35-bootstrap.nix
@@ -12,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 7a6c351..e55b5ca 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
@@ -25,11 +25,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 e79a457..6a71fcc 100644
--- a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix
+++ b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix
@@ -28,12 +28,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 4f11cf0..12fbe20 100644
--- a/tidepool/src/packages/foundation/gzip/versions/1.13-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gzip/versions/1.13-bootstrap.nix
@@ -12,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 77a91ea..14977df 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
@@ -25,11 +25,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 6cfa33c..27c3803 100644
--- a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix
+++ b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix
@@ -28,17 +28,13 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-linux";
         host = "@linux";
-        target = "@host";
       }
       {
         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 d78ed84..736635c 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,11 +11,7 @@ in
       license = lib.licenses.lgpl2Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 edb5912..5c7a5a5 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
@@ -18,11 +18,7 @@ in
       license = lib.licenses.lgpl2Plus;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 5896953..310009e 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
@@ -20,7 +20,6 @@ in
 
     platforms = {
       build = "@linux";
-      host = "@build";
       target = "@linux";
     };
 
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 30f4358..e1382a4 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,11 +12,7 @@ in
       license = lib.licenses.mit;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 393c6c7..8bd3526 100644
--- a/tidepool/src/packages/foundation/musl/versions/1.2.4.nix
+++ b/tidepool/src/packages/foundation/musl/versions/1.2.4.nix
@@ -19,7 +19,6 @@ in
 
     platforms = {
       build = "i686-linux";
-      host = "i686-linux";
       target = [
         "i686-linux"
         "x86_64-linux"
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 e6c13e9..df30cc4 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,11 +12,7 @@ in
       license = lib.licenses.gpl3Plus;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 0ff9fce..7a549dd 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,11 +12,7 @@ in
       license = lib.licenses.psfl;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 cc519af..711379e 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
@@ -27,11 +27,7 @@ in
       license = lib.licenses.psfl;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.basic;
 
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 9bfe2d5..52b7fcd 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,11 +15,7 @@ in
       ];
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 ef1931a..f103fb7 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
@@ -28,11 +28,7 @@ in
       ];
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.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 d12f20a..636ff34 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
@@ -30,12 +30,10 @@ in
       {
         build = "i686-linux";
         host = "x86_64-linux";
-        target = "x86_64-linux";
       }
       {
         build = "x86_64-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 3a96bfe..466a714 100644
--- a/tidepool/src/packages/foundation/zlib/versions/1.3-bootstrap.nix
+++ b/tidepool/src/packages/foundation/zlib/versions/1.3-bootstrap.nix
@@ -12,11 +12,7 @@ in
       license = lib.licenses.zlib;
     };
 
-    platforms = {
-      build = "i686-linux";
-      host = "i686-linux";
-      target = "i686-linux";
-    };
+    platforms.build = "i686-linux";
 
     builder = builders.foundation.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 48d6917..c61c1b1 100644
--- a/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix
+++ b/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix
@@ -17,11 +17,7 @@ in
       license = lib.licenses.zlib;
     };
 
-    platforms = {
-      build = "@linux";
-      host = "@build";
-      target = "@build";
-    };
+    platforms.build = "@linux";
 
     builder = builders.foundation.basic;