diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index 18b5b54ff..75ac259ae 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -50,6 +50,7 @@ jobs:
           # Files are packed into the base directory
           cp *.tgz packages/server/
           cp *.tgz packages/cli/
+          cp -r packages/lambda-tiler/static/ packages/server/
           cp -r packages/lambda-tiler/static/ packages/cli/
 
       - name: Log in to registry
@@ -63,6 +64,7 @@ jobs:
           tags: |
             ghcr.io/linz/basemaps/cli:latest
             ghcr.io/linz/basemaps/cli:${{ steps.version.outputs.version }}
+          outputs: type=oci,dest=/tmp/cli.oci
           push: ${{github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, 'release:') == false}}
 
       - name: '@basemaps/cli - Build and push Major/Minor'
@@ -76,7 +78,7 @@ jobs:
             ghcr.io/linz/basemaps/cli:${{ steps.version.outputs.version_major }}
             ghcr.io/linz/basemaps/cli:${{ steps.version.outputs.version_major_minor }}
             ghcr.io/linz/basemaps/cli:${{ steps.version.outputs.version }}
-
+          outputs: type=oci,dest=/tmp/cli.oci
           push: ${{github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, 'release:')}}
 
       - name: '@basemaps/server - Build and push'
@@ -87,6 +89,7 @@ jobs:
           tags: |
             ghcr.io/linz/basemaps/server:latest
             ghcr.io/linz/basemaps/server:${{ steps.version.outputs.version }}
+          outputs: type=oci,dest=/tmp/server.oci
           push: ${{github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, 'release:') == false}}
 
       - name: '@basemaps/server - Build and push Major/Minor'
@@ -100,4 +103,13 @@ jobs:
             ghcr.io/linz/basemaps/server:${{ steps.version.outputs.version_major }}
             ghcr.io/linz/basemaps/server:${{ steps.version.outputs.version_major_minor }}
             ghcr.io/linz/basemaps/server:${{ steps.version.outputs.version }}
+          outputs: type=oci,dest=/tmp/server.oci
           push: ${{github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, 'release:')}}
+
+      - name: 'Validate Containers build'
+        run: |
+          docker image import /tmp/cli.oci ghcr.io/linz/basemaps/cli:latest
+          docker run ghcr.io/linz/basemaps/cli:latest --help
+          docker image import /tmp/server.oci ghcr.io/linz/basemaps/server:latest
+          docker run ghcr.io/linz/basemaps/server:latest --help
+