diff --git a/.github/workflows/operator-e2e-integration-tests.yml b/.github/workflows/operator-e2e-integration-tests.yml
index 484daadcbd5..3de5ae22c1b 100644
--- a/.github/workflows/operator-e2e-integration-tests.yml
+++ b/.github/workflows/operator-e2e-integration-tests.yml
@@ -27,9 +27,9 @@ jobs:
           --privileged
 
     env:
-      KIND_CLUSTER_NAME: "operator-e2e-cluster"
+      KIND_CLUSTER: "operator-e2e-cluster"
       NAMESPACE: "test-namespace"
-      KIND_CLUSTER: "kind-operator-e2e-cluster"
+      #KIND_CLUSTER: "kind-operator-e2e-cluster"
 
     steps:
       - name: Checkout code
@@ -47,12 +47,12 @@ jobs:
 
       - name: Create KIND cluster
         run: |
-          kind create cluster --name $KIND_CLUSTER_NAME --wait 5m
+          kind create cluster --name $KIND_CLUSTER --wait 5m
 
       - name: Set up kubeconfig
         run: |
-          kubectl config use-context $KIND_CLUSTER
-          echo "kind context is switched to cluster $KIND_CLUSTER"
+          kubectl config use-context kind-$KIND_CLUSTER
+          echo "kind context is switched to cluster kind-$KIND_CLUSTER"
 
 #      - name: Load Docker image into KIND cluster
 #        run: |
@@ -77,4 +77,4 @@ jobs:
         if: always()
         run: |
           # Delete the KIND cluster after tests
-          kind delete cluster --name $KIND_CLUSTER_NAME
+          kind delete cluster --name kind-$KIND_CLUSTER
diff --git a/infra/feast-operator/Makefile b/infra/feast-operator/Makefile
index 6d8d06b8e62..54786eb5f1a 100644
--- a/infra/feast-operator/Makefile
+++ b/infra/feast-operator/Makefile
@@ -117,7 +117,7 @@ test: build-installer fmt vet lint envtest ## Run tests.
 # Utilize Kind or modify the e2e tests to load the image locally, enabling compatibility with other vendors.
 .PHONY: test-e2e  # Run the e2e tests against a Kind k8s instance that is spun up.
 test-e2e:
-	KIND_CLUSTER=operator-e2e-cluster go test ./test/e2e/ -v -ginkgo.v
+	go test ./test/e2e/ -v -ginkgo.v
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter & yamllint