diff --git a/.gitignore b/.gitignore
index ff7eab03..15aa657e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@
 /build
 /conformance
 /promenade.egg-info
-/tmp
 
 # Python artifacts
 __pycache__
diff --git a/Makefile b/Makefile
index b02f9977..1d1c5134 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@
 
 HELM ?= helm
 HELM_PIDFILE ?= $(abspath ./.helm-pid)
-TMP_DIR ?= $(abspath ./tmp)
 
 CHARTS := $(patsubst %/.,%,$(wildcard charts/*/.))
 
@@ -35,7 +34,7 @@ $(CHARTS): helm-serve
 
 .PHONY: helm-serve
 helm-serve:
-	./tools/helm_tk.sh $(HELM) $(HELM_PIDFILE) $(TMP_DIR)
+	./tools/helm_tk.sh $(HELM) $(HELM_PIDFILE)
 
 .PHONY: clean
 clean:
diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml
index e1600d67..2b11c199 100644
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@@ -80,7 +80,7 @@ data:
   values: {}
   source:
     type: git
-    location: https://git.openstack.org/openstack/openstack-helm-infra
+    location: https://git.openstack.org/openstack/openstack-helm
     subpath: helm-toolkit
     reference: master
   dependencies: []
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index 053a0295..90d56e2a 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -109,7 +109,7 @@ data:
   values: {}
   source:
     type: git
-    location: https://git.openstack.org/openstack/openstack-helm-infra
+    location: https://git.openstack.org/openstack/openstack-helm
     subpath: helm-toolkit
     reference: master
   dependencies: []
diff --git a/tools/gate/config-templates/bootstrap-armada-config.yaml b/tools/gate/config-templates/bootstrap-armada-config.yaml
index 5d7d90a7..eac9511e 100644
--- a/tools/gate/config-templates/bootstrap-armada-config.yaml
+++ b/tools/gate/config-templates/bootstrap-armada-config.yaml
@@ -96,7 +96,7 @@ data:
   values: {}
   source:
     type: git
-    location: https://git.openstack.org/openstack/openstack-helm-infra
+    location: https://git.openstack.org/openstack/openstack-helm
     subpath: helm-toolkit
     reference: master
   dependencies: []
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 9eb89151..cae68db9 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -18,7 +18,7 @@ set -eux
 
 HELM=${1}
 HELM_PIDFILE=${2}
-SERVE_DIR=${3}
+SERVE_DIR=$(mktemp -d)
 
 ${HELM} init --client-only
 
@@ -56,9 +56,12 @@ fi
 
 ${HELM} repo add local http://localhost:8879/charts
 
-mkdir -p "${SERVE_DIR}"
-cd "${SERVE_DIR}"
-git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true
-cd openstack-helm-infra
+{
+    cd "${SERVE_DIR}"
+    git clone --depth 1 https://git.openstack.org/openstack/openstack-helm.git || true
+    cd openstack-helm
 
-make helm-toolkit
+    make helm-toolkit
+}
+
+rm -rf "${SERVE_DIR}"