diff --git a/.github/workflows/build-devcontainer.yaml b/.github/workflows/build-devcontainer.yaml
index a85ace2640b6..5c5cffdc5441 100644
--- a/.github/workflows/build-devcontainer.yaml
+++ b/.github/workflows/build-devcontainer.yaml
@@ -1,5 +1,6 @@
 name: build-devcontainer
 
+# Multi-platform build for devcontainer base image
 on:
   workflow_call:
     inputs:
@@ -119,7 +120,7 @@ jobs:
         run: |
           docker buildx imagetools inspect ${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
           platforms=$(docker buildx imagetools inspect ${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} --raw | \
-            jq -r '.manifests[].platform | "\(.os)/\(.architecture)"' | sort)
+            jq -r '.manifests[] | select(.platform.os != "unknown") | .platform | "\(.os)/\(.architecture)"' | sort)
           expected="linux/amd64
           linux/arm64"
           if [ "$platforms" != "$expected" ]; then