diff --git a/.github/workflows/on_pull_request.yaml b/.github/workflows/on_pull_request.yaml
index 0bdbf8a9..1d830b91 100644
--- a/.github/workflows/on_pull_request.yaml
+++ b/.github/workflows/on_pull_request.yaml
@@ -40,6 +40,37 @@ jobs:
 
       - name: Build
         run: yarn build
+  
+  docker-image:
+    runs-on: ubuntu-latest
+    steps: 
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Quay.io
+        uses: docker/login-action@v1
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASS }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
+          push: false
+          tags: quay.io/nmstate/nmstate-console-plugin:latest
+
+
   e2e-tests:
     name: Run e2e tests
     runs-on: ubuntu-latest
@@ -62,12 +93,9 @@ jobs:
           sudo install kubectl /usr/local/bin/kubectl
       - name: Install podman
         run: |
-          curl -LO https://github.com/containers/podman/releases/download/v3.4.4/podman-remote-static.tar.gz
-          tar -xvf podman-remote-static.tar.gz
-          sudo install podman-remote-static /usr/local/bin/podman
-
-          curl -O http://archive.ubuntu.com/ubuntu/pool/universe/g/golang-github-containernetworking-plugins/containernetworking-plugins_1.1.1+ds1-1_amd64.deb
-          sudo dpkg -i containernetworking-plugins_1.1.1+ds1-1_amd64.deb
+          curl -LO https://github.com/containers/podman/releases/download/v4.7.1/podman-remote-static-linux_amd64.tar.gz
+          tar -xvf podman-remote-static-linux_amd64.tar.gz
+          sudo install ./bin/podman-remote-static-linux_amd64 /usr/local/bin/podman
 
       - name: Create Cluster
         run: |
diff --git a/Dockerfile b/Dockerfile
index b6bdad69..b271a140 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Builder container
-FROM registry.access.redhat.com/ubi9/nodejs-18 AS build
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-nodejs-openshift-4.15 AS build
 
 # Install yarn
 RUN npm install -g yarn -s &>/dev/null