diff --git a/Sources/Services/ContainerAPIService/Server/Containers/ContainersService.swift b/Sources/Services/ContainerAPIService/Server/Containers/ContainersService.swift
index 41f33d491..160a774a1 100644
--- a/Sources/Services/ContainerAPIService/Server/Containers/ContainersService.swift
+++ b/Sources/Services/ContainerAPIService/Server/Containers/ContainersService.swift
@@ -334,7 +334,6 @@ public actor ContainersService {
             }
 
             let path = self.containerRoot.appendingPathComponent(configuration.id)
-            let systemPlatform = kernel.platform
 
             // Fetch init image (custom or default)
             self.log.debug(
@@ -343,7 +342,7 @@ public actor ContainersService {
                     "id": "\(configuration.id)"
                 ]
             )
-            let initFilesystem = try await self.getInitBlock(for: systemPlatform.ociPlatform(), imageRef: initImage)
+            let initFilesystem = try await self.getInitBlock(for: SystemPlatform.current.ociPlatform(), imageRef: initImage)
 
             do {
                 self.log.debug(
diff --git a/Sources/Services/MachineAPIService/Server/MachinesService.swift b/Sources/Services/MachineAPIService/Server/MachinesService.swift
index f641d3521..6c08a7ab1 100644
--- a/Sources/Services/MachineAPIService/Server/MachinesService.swift
+++ b/Sources/Services/MachineAPIService/Server/MachinesService.swift
@@ -378,7 +378,7 @@ public actor MachinesService {
                     platform: self.systemPlatform(from: state.snapshot.configuration.platform)
                 )
             } else {
-                kernel = try await ClientKernel.getDefaultKernel(for: .current)
+                kernel = try await ClientKernel.getDefaultKernel(for: self.systemPlatform(from: state.snapshot.configuration.platform))
             }
 
             var fhs: [FileHandle] = []