diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 21a5aceee..ba7829d7c 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -200,9 +200,8 @@ jobs:
       - uses: testspace-com/setup-testspace@v1
         with:
           domain: ${{github.repository_owner}}
-      - name: prepare k3d
-        run: |
-          wget -q -O - https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
+      - name: Create k8s Kind Cluster
+        uses: helm/kind-action@v1.2.0
       - name: run integration
         run: |
           pipenv run make test-integration
diff --git a/Makefile b/Makefile
index 5b5f37c6c..01683a407 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,6 @@ NPM_VERSION = $(shell python -m scripts.npm_version)
 all: lint-fix lint test gen
 
 test-integration:
-	k3d cluster create || exit 0
-	k3d kubeconfig write -o ~/.kube/config --overwrite
 	coverage run manage.py test -v 3 tests/integration
 
 test-e2e:
diff --git a/tests/setup.sh b/tests/setup.sh
index 8ccc45de4..a16edc519 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -7,8 +7,6 @@ sudo chmod +x /usr/local/bin/docker-compose
 # Setup nodejs
 curl -sL https://deb.nodesource.com/setup_15.x | sudo -E bash -
 sudo apt-get install -y nodejs
-# Setup k3d
-curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
 # Setup python
 sudo apt install -y python3.9 python3.9-dev python3-pip libxmlsec1-dev pkg-config
 # Setup docker