diff --git a/.github/workflows/_container-release.yml b/.github/workflows/_container-release.yml
index b80fd4e..5a0f145 100644
--- a/.github/workflows/_container-release.yml
+++ b/.github/workflows/_container-release.yml
@@ -65,10 +65,10 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
-      - name: Rebuild and release image
-        uses: docker/build-push-action@v2
+      - name: Rebuild and release CI image
+        uses: docker/build-push-action@v5
         with:
           context: . 
           file: ./PandABlocks-rootfs/Dockerfile
@@ -76,3 +76,24 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           push: ${{ github.event_name != 'pull_request' }}
+          target: developer
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/pandablocks/pandablocks-ci-container
+          tags: |
+            type=ref,event=branch
+            type=ref,event=tag
+            type=raw,value=latest
+
+      - name: Rebuild and release image
+        uses: docker/build-push-action@v5
+        with:
+          context: . 
+          file: ./PandABlocks-rootfs/Dockerfile
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          push: ${{ github.event_name != 'pull_request' }}
\ No newline at end of file