diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index 280c9ec9..00000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Deploy
-on:
-  push:
-    branches:
-      - main
-jobs:
-  deploy:
-    name: deploy
-    runs-on: ubuntu-latest
-    env:
-      BUILDX_NO_DEFAULT_ATTESTATIONS: 1
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - 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: true
-          tags: quay.io/nmstate/nmstate-console-plugin:latest
diff --git a/.github/workflows/on_pull_request.yaml b/.github/workflows/on_pull_request.yaml
index 0bdbf8a9..4b4c6160 100644
--- a/.github/workflows/on_pull_request.yaml
+++ b/.github/workflows/on_pull_request.yaml
@@ -40,6 +40,7 @@ jobs:
 
       - name: Build
         run: yarn build
+
   e2e-tests:
     name: Run e2e tests
     runs-on: ubuntu-latest
@@ -62,12 +63,7 @@ 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
+          sudo apt-get -y install 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
diff --git a/scripts/deploy-cluster.sh b/scripts/deploy-cluster.sh
index 71ed9652..5cef635d 100755
--- a/scripts/deploy-cluster.sh
+++ b/scripts/deploy-cluster.sh
@@ -41,28 +41,28 @@ echo "Found: ${CONTAINER_CMD}"
 
 # Starting local registry and temp data dir
 # ---------------------------------------------
-echo ""
-echo "Starting local registry and tmp local storage"
-echo "=============================================="
+# echo ""
+# echo "Starting local registry and tmp local storage"
+# echo "=============================================="
 
-reg_name='kind-registry'
-reg_port='5001'
+# reg_name='kind-registry'
+# reg_port='5001'
 
-# Create the kind network
-${CONTAINER_CMD} network create kind  --driver bridge
-${CONTAINER_CMD} network ls
+# # Create the kind network
+# ${CONTAINER_CMD} network create kind
+# ${CONTAINER_CMD} network ls
 
-# Create the registry
-if [ "$(${CONTAINER_CMD} inspect -f {{.State.Running}} "${reg_name}" 2>/dev/null || true)" != 'true' ]; then
-  ${CONTAINER_CMD} run \
-    -d --restart=always -p "127.0.0.1:${reg_port}:5000" --name "${reg_name}" --net kind \
-    registry:2
-fi
-reg_ip=$(${CONTAINER_CMD} inspect -f {{.NetworkSettings.Networks.kind.IPAddress}} ${reg_name})
+# # Create the registry
+# if [ "$(${CONTAINER_CMD} inspect -f {{.State.Running}} "${reg_name}" 2>/dev/null || true)" != 'true' ]; then
+#   ${CONTAINER_CMD} run \
+#     -d --restart=always -p "127.0.0.1:${reg_port}:5000" --name "${reg_name}" --net kind \
+#     registry:2
+# fi
+# reg_ip=$(${CONTAINER_CMD} inspect -f {{.NetworkSettings.Networks.kind.IPAddress}} ${reg_name})
 
-echo "reg_name: ${reg_name}"
-echo "reg_port: ${reg_port} (localhost, http://localhost:${reg_port})"
-echo "reg_ip:   ${reg_ip} (cluster, http://${reg_ip}:5000)"
+# echo "reg_name: ${reg_name}"
+# echo "reg_port: ${reg_port} (localhost, http://localhost:${reg_port})"
+# echo "reg_ip:   ${reg_ip} (cluster, http://${reg_ip}:5000)"
 
 # Create tmp storage dir
 host_path=$(mktemp -d -t kind-storage-XXXXX)
@@ -95,10 +95,6 @@ nodes:
     containerPath: /data
 - role: worker
 - role: worker
-containerdConfigPatches:
-- |-
-  [plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:${reg_port}"]
-    endpoint = ["http://${reg_ip}:5000"]
 EOF
 
 # Install Openshift console
@@ -156,7 +152,7 @@ echo "==========================================="
 echo ""
 echo "Routes:"
 echo "  server:      https://127.0.0.1:6443/"
-echo "  registry:    http://localhost:${reg_port}/"
+# echo "  registry:    http://localhost:${reg_port}/"
 echo "  web console: http://localhost:30080/"
 
 echo ""