diff --git a/.github/workflows/image-build.yaml b/.github/workflows/image-build.yaml
new file mode 100644
index 00000000..7f7f9be9
--- /dev/null
+++ b/.github/workflows/image-build.yaml
@@ -0,0 +1,26 @@
+name: Multiple Architecture Image Build
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'main'
+      - 'release-*'
+    tags:
+      - 'v*'
+
+concurrency:
+  group: build-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  image-build:
+    uses: konveyor/release-tools/.github/workflows/build-push-images.yaml@main
+    with:
+      registry: "quay.io/konveyor"
+      image_name: "analyzer-lsp"
+      containerfile: "./Dockerfile"
+      architectures: '[ "amd64", "arm64", "ppc64le", "s390x" ]'
+    secrets:
+      registry_username: ${{ secrets.QUAY_PUBLISH_ROBOT }}
+      registry_password: ${{ secrets.QUAY_PUBLISH_TOKEN }}
diff --git a/.github/workflows/multi-arch_images_build.yaml b/.github/workflows/multi-arch_images_build.yaml
deleted file mode 100644
index 31672e64..00000000
--- a/.github/workflows/multi-arch_images_build.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: 'Build and Push Multi-Arch Image'
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - 'main'
-      - 'release-*'
-    tags:
-      - 'v*'
-
-concurrency:
-  group: march-build-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  push-quay:
-    name: Build and Push Manifest
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-    steps:
-    - name: Checkout Push to Registry action
-      uses: konveyor/release-tools/build-push-quay@main
-      with:
-        architectures: "amd64, arm64, ppc64le, s390x"
-        containerfile: "./Dockerfile"
-        image_name: "analyzer-lsp"
-        image_namespace: "konveyor"
-        image_registry: "quay.io"
-        quay_publish_robot: ${{ secrets.QUAY_PUBLISH_ROBOT }}
-        quay_publish_token: ${{ secrets.QUAY_PUBLISH_TOKEN }}
-        ref: ${{ github.ref }}