diff --git a/.github/workflows/release_images.yaml b/.github/workflows/release_images.yaml
new file mode 100644
index 0000000..673c125
--- /dev/null
+++ b/.github/workflows/release_images.yaml
@@ -0,0 +1,56 @@
+name: Docker Build images on Tag
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up gcloud CLI
+      uses: google-github-actions/setup-gcloud@v0.2.0
+      with:
+        service_account_key: ${{ secrets.GCP_SA_KEY }}
+        project_id: genuine-flight-317411
+        export_default_credentials: true
+
+    # Configure Docker to use the gcloud command-line tool as a credential helper for authentication
+    - name: Configure Docker
+      run: |-
+        gcloud auth configure-docker us-central1-docker.pkg.dev
+
+    - name: Verify gcloud configuration
+      run: |-
+        gcloud config get-value project
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v2
+      with:
+        file: dockerfile
+        context: .
+        platforms: linux/arm64,linux/amd64
+        push: true
+        tags: us-central1-docker.pkg.dev/genuine-flight-317411/devel/java-toolkit:${{ github.ref_name }}
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Build and push Docker images Dockerhub
+      uses: docker/build-push-action@v2
+      with:
+        file: dockerfile
+        context: .
+        platforms: linux/arm64,linux/amd64
+        push: true
+        tags: robustadev/java-toolkit:${{ github.ref_name }}
\ No newline at end of file
diff --git a/build_release.sh b/build_release.sh
index 3fae3a2..4525239 100644
--- a/build_release.sh
+++ b/build_release.sh
@@ -2,6 +2,6 @@ docker buildx build \
   --build-arg BUILDKIT_INLINE_CACHE=1 \
   --platform linux/arm64,linux/amd64 \
   --tag robustadev/java-toolkit:${TAG} \
-  --tag us-central1-docker.pkg.dev/genuine-flight-317411/devel/java-toolkit-11:${TAG} \
+  --tag us-central1-docker.pkg.dev/genuine-flight-317411/devel/java-toolkit:${TAG} \
   --push \
   .
\ No newline at end of file