diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index feb19aac97..8ea8bc8ed8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -145,10 +145,9 @@ jobs:
       - name: Create k3d registry and cluster
         run: |
           k3d registry create e2e-registry --port 5111
-          k3d cluster create e2e -i rancher/k3s:v1.27.10-k3s2 --registry-use k3d-e2e-registry:5111
+          k3d cluster create -i rancher/k3s:v1.27.10-k3s2 --registry-use k3d-e2e-registry:5111
           echo '127.0.0.1 k3d-e2e-registry' | sudo tee -a /etc/hosts
       - name: Run tests
         run: |
-          export KUBECONFIG=$(k3d kubeconfig write e2e)
           IMAGE_NAMESPACE=k3d-e2e-registry:5111 VERSION=${{ github.sha }} DOCKER_PUSH=true make start
           EventBusDriver=${{ matrix.driver }} make test-functional
diff --git a/Makefile b/Makefile
index 6332878683..c7d4c86438 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ override LDFLAGS += -X ${PACKAGE}.gitTag=${GIT_TAG}
 endif
 
 K3D ?= $(shell [ "`command -v kubectl`" != '' ] && [ "`command -v k3d`" != '' ] && [[ "`kubectl config current-context`" =~ k3d-* ]] && echo true || echo false)
-K3DCLUSTER?=e2e
+K3DCLUSTER?=k3s-default
 
 # Check that the needed executables are available, else exit before the build
 K := $(foreach exec,$(EXECUTABLES), $(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH")))