diff --git a/.circleci/config.yml b/.circleci/config.yml
index bc107d7e..07b78832 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -79,10 +79,6 @@ jobs:
   integration_tests:
     machine:
       image: circleci/classic:201808-01
-    environment:
-      CHANGE_MINIKUBE_NONE_USER: true
-      MINIKUBE_WANTUPDATENOTIFICATION: false
-      MINIKUBE_WANTREPORTERRORPROMPT: false
     steps:
       - checkout
       - run: mkdir ~/build
@@ -102,32 +98,8 @@ jobs:
             tar zxf ${HELM_FILENAME} linux-amd64/helm
             chmod +x linux-amd64/helm
             sudo mv linux-amd64/helm /usr/local/bin/
-      - run:
-          name: Install kustomize
-          environment:
-            KUSTOMIZE_VERSION: v3.6.1
-          command: |
-            KUSTOMIZE_FILENAME="kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz"
-            curl -Lo ${KUSTOMIZE_FILENAME} "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/${KUSTOMIZE_FILENAME}"
-            tar zxf ${KUSTOMIZE_FILENAME} kustomize
-            chmod +x kustomize
-            sudo mv kustomize /usr/local/bin/
-      - run:
-          name: Deploy minikube
-          environment:
-            CHANGE_MINIKUBE_NONE_USER: true
-            K8S_VERSION: v1.12.3
-            MINIKUBE_VERSION: v0.30.0
-          command: |
-            curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl
-            chmod +x kubectl && sudo mv kubectl /usr/local/bin/
-            curl -Lo minikube https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-amd64
-            chmod +x minikube && sudo mv minikube /usr/local/bin/
-            sudo -E minikube start --vm-driver=none --kubernetes-version=${K8S_VERSION}
-            sudo -E minikube update-context
-      - run:
-          name: Wait for nodes to become ready
-          command: JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done
+      - run: make -C .circleci kustomize
+      - run: make -C .circleci minikube
       - run:
           name: Execute integration tests
           command: |
@@ -137,10 +109,6 @@ jobs:
   integration_tests_helm3:
     machine:
       image: circleci/classic:201808-01
-    # environment:
-    #   CHANGE_MINIKUBE_NONE_USER: true
-    #   MINIKUBE_WANTUPDATENOTIFICATION: false
-    #   MINIKUBE_WANTREPORTERRORPROMPT: false
     steps:
     - checkout
     - run: mkdir ~/build
@@ -150,45 +118,9 @@ jobs:
         command: |
           cp ~/build/helmfile ~/project/helmfile
           cp ~/build/diff-yamls ~/project/diff-yamls
-    - run:
-        name: Install helm
-        command: cd .circleci; make helm
-        # environment:
-        #   HELM_VERSION: v3.5.3
-        # command: |
-        #   HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
-        #   curl -Lo ${HELM_FILENAME} "https://get.helm.sh/${HELM_FILENAME}"
-        #   tar zxf ${HELM_FILENAME} linux-amd64/helm
-        #   chmod +x linux-amd64/helm
-        #   sudo mv linux-amd64/helm /usr/local/bin/
-    - run:
-        name: Install kustomize
-        command: cd .circleci; make kustomize
-        # environment:
-        #   KUSTOMIZE_VERSION: v3.8.8
-        # command: |
-        #   KUSTOMIZE_FILENAME="kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz"
-        #   curl -Lo ${KUSTOMIZE_FILENAME} "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/${KUSTOMIZE_FILENAME}"
-        #   tar zxf ${KUSTOMIZE_FILENAME} kustomize
-        #   chmod +x kustomize
-        #   sudo mv kustomize /usr/local/bin/
-    - run:
-        name: Deploy minikube
-        command: cd .circleci; make minikube
-        # environment:
-        #   CHANGE_MINIKUBE_NONE_USER: true
-        #   K8S_VERSION: v1.12.3
-        #   MINIKUBE_VERSION: v0.30.0
-        # command: |
-        #   curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl
-        #   chmod +x kubectl && sudo mv kubectl /usr/local/bin/
-        #   curl -Lo minikube https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-amd64
-        #   chmod +x minikube && sudo mv minikube /usr/local/bin/
-        #   sudo -E minikube start --vm-driver=none --kubernetes-version=${K8S_VERSION}
-        #   sudo -E minikube update-context
-    # - run:
-    #     name: Wait for nodes to become ready
-    #     command: JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done
+    - run: make -C .circleci helm
+    - run: make -C .circleci kustomize
+    - run: make -C .circleci minikube
     - run:
         name: Execute integration tests
         command: |