diff --git a/.github/workflows/local-test-infra.yaml b/.github/workflows/local-test-infra.yaml
index 113d0729..c4c8f91a 100644
--- a/.github/workflows/local-test-infra.yaml
+++ b/.github/workflows/local-test-infra.yaml
@@ -27,8 +27,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Start the k8s cluster
-        uses: ./.github/actions/start-k8s-cluster
+      - name: Setup the k8s cluster
+        uses: palmsoftware/quick-k8s@v0.0.12
+        with:
+          disableDefaultCni: true
+          numControlPlaneNodes: 1
+          numWorkerNodes: 3
+          installOLM: true
 
       - name: Create `local-test-infra` OpenShift resources
         uses: ./.github/actions/create-local-test-infra-resources
diff --git a/.github/workflows/pre-main.yml b/.github/workflows/pre-main.yml
index 8f0dd6d9..dedafab7 100644
--- a/.github/workflows/pre-main.yml
+++ b/.github/workflows/pre-main.yml
@@ -59,26 +59,6 @@ jobs:
       PFLT_DOCKERCONFIG: '/home/runner/.docker/config'
 
     steps:
-      # Restart docker using /mnt/docker-storage (sdb) instead of /var/lib/docker (sda).
-      # This step needs to be done right after the partner repo's bootstrap scripts, as they
-      # overwrite the docker's daemon.json.
-      - name: Create docker/daemon.json if it does not exist
-        run: |
-          if [ ! -f /etc/docker/daemon.json ]; then
-            echo '{}' | sudo tee /etc/docker/daemon.json
-          fi
-
-      - name: Make docker to use /mnt (sdb) for storage
-        run: |
-          df -h
-          lsblk
-          sudo mkdir /mnt/docker-storage
-          sudo jq '.  +={"data-root" : "/mnt/docker-storage"}' < /etc/docker/daemon.json > /tmp/docker-daemon.json
-          sudo cp /tmp/docker-daemon.json /etc/docker/daemon.json
-          cat /etc/docker/daemon.json
-          sudo systemctl restart docker
-          sudo ls -la /mnt/docker-storage
-
       - name: Set up Go 1.23
         uses: actions/setup-go@v5
         with:
@@ -87,19 +67,21 @@ jobs:
       - name: Disable default go problem matcher
         run: echo "::remove-matcher owner=go::"
 
-      - name: Write temporary docker file
-        run: |
-          mkdir -p /home/runner/.docker
-          touch ${PFLT_DOCKERCONFIG}
-          echo '{ "auths": {} }' >> ${PFLT_DOCKERCONFIG}
+      - name: Setup quick-k8s cluster
+        uses: palmsoftware/quick-k8s@v0.0.12
+        with:
+          disableDefaultCni: true
+          numControlPlaneNodes: 1
+          numWorkerNodes: 3
+          installOLM: true
 
       - name: Check out `certsuite-sample-workload`
         uses: actions/checkout@v4
         with:
           ref: ${{ github.sha }}
 
-      - name: Start the k8s cluster
-        uses: ./.github/actions/start-k8s-cluster
+      - name: run tmate
+        uses: mxschmitt/action-tmate@v3
 
       - name: Create `local-test-infra` OpenShift resources
         uses: ./.github/actions/create-local-test-infra-resources
diff --git a/.github/workflows/preflight.yml b/.github/workflows/preflight.yml
index 6af0629d..37636457 100644
--- a/.github/workflows/preflight.yml
+++ b/.github/workflows/preflight.yml
@@ -72,9 +72,6 @@ jobs:
           repository: redhat-openshift-ecosystem/openshift-preflight
           path: openshift-preflight
 
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3
-
       - name: Run preflight
         working-directory: openshift-preflight
         run: |
diff --git a/Makefile b/Makefile
index bf5fbdb9..414f4f44 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ install:
 	./scripts/deploy-pod-disruption-budget.sh
 	./scripts/deploy-special-resources.sh
 	./scripts/deploy-test-crds.sh
-	./scripts/install-olm.sh
+#	./scripts/install-olm.sh
 	./scripts/manage-service.sh deploy
 	./scripts/deploy-network-policies.sh
 	./scripts/delete-standard-storageclass.sh