diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml
new file mode 100644
index 0000000..bb0ebcb
--- /dev/null
+++ b/.github/workflows/container_build.yml
@@ -0,0 +1,67 @@
+name: ci container build
+
+on:
+  pull_request:
+    branches:
+      - 'main'
+  push:
+    branches:
+      - 'main'
+    tags:
+      - "v*.*.*"
+env:
+  TEST_TAG: user/app:test
+  LATEST_TAG: user/app:latest
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            ghcr.io/${{ github.repository_owner }}/container_template            
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+            type=raw,value=latest,enable={{is_default_branch}} 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and export to Docker
+        uses: docker/build-push-action@v6
+        with:
+          load: true
+          tags: ${{ env.TEST_TAG }}
+      - name: Test
+        run: |
+          docker run --rm ${{ env.TEST_TAG }} 
+
+      - name: Build
+        uses: docker/build-push-action@v6
+        with:
+          context: "{{defaultContext}}:docker"
+          push: False
+          load: True
+          tags: ${{ steps.meta.outputs.tags }}
+          file:
+            ./dockerfiles/container_template/Dockerfile
+          platforms: linux/amd64
diff --git a/.github/workflows/container_build_push.yml b/.github/workflows/container_build_push.yml
index 424d403..2b41911 100644
--- a/.github/workflows/container_build_push.yml
+++ b/.github/workflows/container_build_push.yml
@@ -1,9 +1,7 @@
-name: container-build-push
+name: ci container build-push
 
 on:
   push:
-    branches:
-      - 'main'
     tags:
       - "v*.*.*"
     
@@ -40,7 +38,7 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}      
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: "{{defaultContext}}:docker"
           push: ${{ github.event_name != 'pull_request' }}