diff --git a/.devcontainer/ci/features/devcontainer-feature.json b/.devcontainer/ci/features/devcontainer-feature.json
index 5f771e34..3a7322e3 100644
--- a/.devcontainer/ci/features/devcontainer-feature.json
+++ b/.devcontainer/ci/features/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
-  "name": "Flux Cluster Template (Tools)",
+  "name": "Cluster Template",
   "id": "cluster-template",
   "version": "1.0.0",
-  "description": "Install Tools"
+  "description": "Work environment for the Cluster Template project"
 }
diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml
index c6aa7989..f4b04153 100644
--- a/.github/workflows/devcontainer.yaml
+++ b/.github/workflows/devcontainer.yaml
@@ -21,7 +21,7 @@ jobs:
   devcontainer:
     if: ${{ github.repository == 'onedr0p/cluster-template' }}
     name: publish
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04 # TODO: Change to ubuntu-latest when available
     permissions:
       contents: read
       packages: write
@@ -34,8 +34,6 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          platforms: linux/amd64 #,linux/arm64
 
       - if: ${{ github.event_name != 'pull_request' }}
         name: Login to GitHub Container Registry
@@ -47,12 +45,10 @@ jobs:
 
       - name: Build and push
         uses: devcontainers/ci@v0.3
-        env:
-          BUILDX_NO_DEFAULT_ATTESTATIONS: true
         with:
           imageName: ghcr.io/${{ github.repository }}/devcontainer
-          # cacheFrom: ghcr.io/${{ github.repository }}/devcontainer
+          cacheFrom: ghcr.io/${{ github.repository }}/devcontainer
           imageTag: latest
-          platform: linux/amd64 #,linux/arm64
+          platform: linux/amd64,linux/arm64
           configFile: .devcontainer/ci/devcontainer.json
           push: ${{ github.event_name == 'pull_request' && 'never' || 'always' }}