diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index c492951ab..f98474445 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -56,19 +56,15 @@ jobs:
       - name: Log in to registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
 
-      - name: '@basemaps/cli - Build and push'
+      - name: '@basemaps/cli - Build and export to Docker'
         uses: docker/build-push-action@v5
         with:
-          context: packages/cli
-          platforms: linux/arm64,linux/amd64
           load: true
-          tags: |
-            ghcr.io/linz/basemaps/cli:latest
-            ghcr.io/linz/basemaps/cli:${{ steps.version.outputs.version }}
+          tags: cli
 
       - name: Test
         run: |
-          docker run --rm ghcr.io/linz/basemaps/cli:${{ steps.version.outputs.version }}
+          docker run --rm cli
 
       - name: '@basemaps/cli - Build and push'
         uses: docker/build-push-action@v5