diff --git a/.github/workflows/build-push-images.yml b/.github/workflows/build-push-images.yml
new file mode 100644
index 0000000..745af63
--- /dev/null
+++ b/.github/workflows/build-push-images.yml
@@ -0,0 +1,46 @@
+name: publish-image
+
+on:
+
+  push:
+    branches:
+    - main
+
+  workflow_dispatch:
+
+env:
+  NAMESPACE: quay.io/centos-boot
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        image: [eln-dev]
+        # Change once we have rhtap publishing base images as multi-arch
+        arch: [amd64]
+
+    steps:
+      - name: Install qemu dependency
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static
+
+      - name: Checkout repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Login to quay.io
+        run: buildah login --username ${{ secrets.QUAY_USER }} --password ${{ secrets.QUAY_PASSWORD }} quay.io
+
+      - name: Build
+        uses: redhat-actions/buildah-build@b4dc19b4ba891854660ab1f88a097d45aa158f76 # v2.12
+        with:
+          image: ${{ env.NAMESPACE }}/${{ matrix.IMAGE }}
+          tags: latest
+          containerfiles: ./Containerfile
+          archs: amd64
+          context: .
+
+      - name: Push To quay.io
+        run: buildah manifest push --all ${{ env.NAMESPACE }}/${{ matrix.IMAGE }}
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
deleted file mode 100644
index d657a63..0000000
--- a/.github/workflows/docker-image.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Docker Image CI
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)