diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
index 272a8327c35..b38a576ad9c 100755
--- a/.github/scripts/build.sh
+++ b/.github/scripts/build.sh
@@ -3,21 +3,11 @@ set -e
 
 echo "${VERSION}"
 
-echo "Make"
-make
-
-echo "Build"
-make docker_build
-
 if [[ -v PUSH_REGISTRY ]]
 then
     echo "Logging in to registry"
     docker login -u "${REGISTRY_USER}" -p "${REGISTRY_PASS}" "${DOCKER_REGISTRY}"
-    make TAG="${VERSION}" docker_tag docker_push
+    make TAG="${VERSION}" buildpush
+else
+    make IMAGE_PULL_POLICY=IfNotPresent buildpushkind
 fi
-
-echo "Push to registry"
-make -j 4 docker_tag docker_push
-
-echo "Generate templates"
-make templates
diff --git a/.github/scripts/setup_kind.sh b/.github/scripts/setup_kind.sh
new file mode 100755
index 00000000000..15e8c4ea748
--- /dev/null
+++ b/.github/scripts/setup_kind.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+curl -Lo ./kind "https://kind.sigs.k8s.io/dl/v0.8.1/kind-$(uname)-amd64"
+chmod +x ./kind
+
+cat <<EOF | ./kind create cluster --config=-
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+- role: control-plane
+  kubeadmConfigPatches:
+  - |
+    kind: InitConfiguration
+    nodeRegistration:
+      kubeletExtraArgs:
+        node-labels: "ingress-ready=true"
+  extraPortMappings:
+  - containerPort: 80
+    hostPort: 80
+    protocol: TCP
+  - containerPort: 443
+    hostPort: 443
+    protocol: TCP
+EOF
+
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/provider/kind/deploy.yaml
+kubectl patch deployment ingress-nginx-controller -n ingress-nginx --type=json -p '[{"op":"add","path":"/spec/template/spec/containers/0/args/-","value":"--enable-ssl-passthrough"}]'
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index e1f9b586b6f..31a2eae7e9d 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -44,8 +44,8 @@ jobs:
       - name: setup-docker
         run: ./.github/scripts/setup_docker.sh
 
-      - name: Minikube setup with registry
-        uses: EnMasseProject/minikube-setup@V1.0.2
+      - name: setup-kind
+        run: ./.github/scripts/setup_kind.sh
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cf17303aaf4..555d5f1e67d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,8 +46,8 @@ jobs:
       - name: setup-docker
         run: ./.github/scripts/setup_docker.sh
 
-      - name: Minikube setup with registry
-        uses: EnMasseProject/minikube-setup@V1.0.2
+      - name: setup-kind
+        run: ./.github/scripts/setup_kind.sh
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index a3d390896aa..5d72224ed2d 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -34,8 +34,8 @@ jobs:
       - name: setup-docker
         run: ./.github/scripts/setup_docker.sh
 
-      - name: Minikube setup with registry
-        uses: EnMasseProject/minikube-setup@V1.0.2
+      - name: setup-kind
+        run: ./.github/scripts/setup_kind.sh
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1
diff --git a/Makefile b/Makefile
index 10478610e9a..58a0345a582 100644
--- a/Makefile
+++ b/Makefile
@@ -96,13 +96,13 @@ coverage_go:
 buildpush:
 	$(MAKE)
 	$(MAKE) docker_build
-	$(MAKE) docker_tag
-	$(MAKE) docker_push
+	$(MAKE) -j 4 docker_tag
+	$(MAKE) -j 4 docker_push
 
 buildpushkind:
 	$(MAKE)
 	$(MAKE) docker_build
-	$(MAKE) docker_tag
+	$(MAKE) -j 4 docker_tag
 	$(MAKE) kind_load_image
 
 clean_java: