diff --git a/.tekton/frontend-operator-pull-request.yaml b/.tekton/frontend-operator-pull-request.yaml
index 40ecefb0..6410c9bc 100644
--- a/.tekton/frontend-operator-pull-request.yaml
+++ b/.tekton/frontend-operator-pull-request.yaml
@@ -250,7 +250,7 @@ spec:
         - name: TEST_OUTPUT
           description: Test output
         steps:
-        - image: registry.access.redhat.com/ubi8/go-toolset:1.20.12-5.1712568462
+        - image: quay.io/mknop_console_dot/konflux-go-kubectl:0001
           env:
           - name: SNAPSHOT
             value: $(params.SNAPSHOT)
diff --git a/Makefile b/Makefile
index 21846aa8..fe35eae3 100644
--- a/Makefile
+++ b/Makefile
@@ -116,26 +116,21 @@ junit: gotestsum manifests envtest generate fmt vet
 
 # entry point for testing kuttl with kind
 kuttl: manifests envtest generate fmt vet
-	curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-	chmod +x kubectl
-	mkdir -p ~/.local/bin
-	mv ./kubectl ~/.local/bin/kubectl
-
-	# # Install krew for kubectl
-	# set -x; cd "$(mktemp -d)" && \
-	# OS="$(uname | tr '[:upper:]' '[:lower:]')" && \
-	# ARCH="$(uname -m | sed -e 's/x86_64/amd64/' -e 's/\(arm\)\(64\)\?.*/\1\2/' -e 's/aarch64$/arm64/')" && \
-	# KREW="krew-${OS}_${ARCH}" && \
-	# curl -fsSLO "https://github.com/kubernetes-sigs/krew/releases/latest/download/${KREW}.tar.gz" && \
-	# tar zxvf "${KREW}.tar.gz" && \
-	# ./"${KREW}" install krew
-
-	# export PATH="${KREW_ROOT:-${HOME}/.krew}/bin:${PATH}"
-	# export PATH="/bins:${PATH}"
+	# Install krew for kubectl
+	set -x; cd "$(mktemp -d)" && \
+	OS="$(uname | tr '[:upper:]' '[:lower:]')" && \
+	ARCH="$(uname -m | sed -e 's/x86_64/amd64/' -e 's/\(arm\)\(64\)\?.*/\1\2/' -e 's/aarch64$/arm64/')" && \
+	KREW="krew-${OS}_${ARCH}" && \
+	curl -fsSLO "https://github.com/kubernetes-sigs/krew/releases/latest/download/${KREW}.tar.gz" && \
+	tar zxvf "${KREW}.tar.gz" && \
+	./"${KREW}" install krew
+
+	export PATH="${KREW_ROOT:-${HOME}/.krew}/bin:${PATH}"
+	export PATH="/bins:${PATH}"
 	export PATH="/.local/bin:${PATH}"
 
-	# # Install kuttl with krew
-	# kubectl krew install kuttl
+	# Install kuttl with krew
+	kubectl krew install kuttl
 
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" kubectl kuttl test --config kuttl-config.yml  ./tests/e2e