diff --git a/docker/compose.build.yaml b/docker/compose.build.yaml
index 7cd5fd19a..1a653bb41 100644
--- a/docker/compose.build.yaml
+++ b/docker/compose.build.yaml
@@ -10,7 +10,6 @@ services:
       dockerfile: docker/Dockerfile
       target: app
       platforms:
-        # due to nassl
         - "linux/amd64"
 
   db-migrate:
@@ -19,7 +18,6 @@ services:
       dockerfile: docker/Dockerfile
       target: app
       platforms:
-        # due to nassl
         - "linux/amd64"
 
   worker: &worker
@@ -28,7 +26,6 @@ services:
       dockerfile: docker/Dockerfile
       target: app
       platforms:
-        # due to nassl
         - "linux/amd64"
 
   worker-nassl:
@@ -37,7 +34,6 @@ services:
       dockerfile: docker/Dockerfile
       target: app
       platforms:
-        # due to nassl
         - "linux/amd64"
 
   worker-slow:
@@ -46,7 +42,6 @@ services:
       dockerfile: docker/Dockerfile
       target: app
       platforms:
-        # due to nassl
         - "linux/amd64"
 
   beat:
@@ -55,7 +50,6 @@ services:
       dockerfile: docker/Dockerfile
       target: app
       platforms:
-        # due to nassl
         - "linux/amd64"
 
   unbound:
@@ -64,7 +58,6 @@ services:
       dockerfile: docker/Dockerfile
       target: unbound
       platforms:
-        # due to nassl
         - "linux/amd64"
 
   resolver-permissive:
@@ -73,7 +66,6 @@ services:
       dockerfile: docker/Dockerfile
       target: unbound
       platforms:
-        # due to nassl
         - "linux/amd64"
 
   resolver-validating:
@@ -82,23 +74,31 @@ services:
       dockerfile: docker/Dockerfile
       target: unbound
       platforms:
-        # due to nassl
         - "linux/amd64"
 
   cron:
     build:
       context: ..
       dockerfile: docker/util.Dockerfile
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
 
   cron-docker:
     build:
       context: ..
       dockerfile: docker/util.Dockerfile
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
 
   grafana:
     build:
       context: ..
       dockerfile: docker/grafana.Dockerfile
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
 
   test:
     build:
@@ -108,23 +108,31 @@ services:
       args:
         RELEASE: 0.0.0-dev0
       platforms:
-        # due to nassl
         - "linux/amd64"
 
   test-runner:
     build:
       context: ..
       dockerfile: docker/test-runner.Dockerfile
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
 
   test-runner-development-environment:
     build:
       context: ..
       dockerfile: docker/test-runner.Dockerfile
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
 
   test-runner-live:
     build:
       context: ..
       dockerfile: docker/test-runner.Dockerfile
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
 
   tools:
     build:
@@ -134,7 +142,6 @@ services:
       args:
         RELEASE: 0.0.0-dev0
       platforms:
-        # due to nassl
         - "linux/amd64"
 
   mock-resolver:
@@ -143,5 +150,4 @@ services:
       dockerfile: docker/Dockerfile
       target: unbound
       platforms:
-        # due to nassl
         - "linux/amd64"