diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2ee92518..de883b32 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -46,6 +46,14 @@ jobs:
       uses: actions/setup-go@v3
       with:
         go-version-file: go.mod
+    - name: Setup Minikube Cluster
+      uses: medyagh/setup-minikube@latest
+      with:
+        driver: none
+        kubernetes-version: ${{ matrix.kubernetes-version }}
+        minikube-version: '1.34.0'
+        wait: 'all'
+        start-args: '--wait-timeout=120s'
     - name: Run tests
       env:
         RELEASE_VERSION: test
@@ -54,4 +62,8 @@ jobs:
         PLATFORMS: linux/amd64
         INTEL_PLATFORMS: linux/amd64
         MPICH_PLATFORMS: linux/amd64
-      run: make test_e2e
+        USE_EXISTING_CLUSTER: true
+      shell: bash
+      run: |
+        make ci_test_images
+        make test_e2e -o test_images -o kind
diff --git a/Makefile b/Makefile
index 99798d54..41e4dc1a 100644
--- a/Makefile
+++ b/Makefile
@@ -102,6 +102,12 @@ images:
 	@echo "VERSION: ${RELEASE_VERSION}"
 	${IMG_BUILDER} build $(BUILD_ARGS) --platform $(PLATFORMS) --build-arg VERSION=${CONTROLLER_VERSION} --build-arg RELEASE_VERSION=${RELEASE_VERSION} -t ${IMAGE_NAME}:${RELEASE_VERSION} .
 
+.PHONY: ci_test_images
+ci_test_images: test_images
+	minikube image load ${REGISTRY}/mpi-pi:${RELEASE_VERSION}-openmpi
+	minikube image load ${REGISTRY}/mpi-pi:${RELEASE_VERSION}-intel
+	minikube image load ${REGISTRY}/mpi-pi:${RELEASE_VERSION}-mpich
+
 .PHONY: test_images
 test_images:
 	${IMG_BUILDER} build $(BUILD_ARGS) --platform $(PLATFORMS) --build-arg port=${BASE_IMAGE_SSH_PORT} -t ${REGISTRY}/base:${RELEASE_VERSION} build/base