diff --git a/Makefile b/Makefile
index 1615a3d5..1ac53d1f 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ clean:
 
 # testing checks
 .PHONY: tests
-tests: check-tox helm_lint
+tests: check-tox
 	tox
 
 .PHONY: test-all
diff --git a/armada/tests/unit/resources/keystone-manifest.yaml b/armada/tests/unit/resources/keystone-manifest.yaml
index 73fe7c19..83d84fb4 100644
--- a/armada/tests/unit/resources/keystone-manifest.yaml
+++ b/armada/tests/unit/resources/keystone-manifest.yaml
@@ -10,7 +10,7 @@ data:
   values: {}
   source:
     type: git
-    location: https://git.openstack.org/openstack/openstack-helm
+    location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
     reference: master
   dependencies: []
diff --git a/armada/tests/unit/resources/valid_armada_document.yaml b/armada/tests/unit/resources/valid_armada_document.yaml
index 4047ebbd..63d30b84 100644
--- a/armada/tests/unit/resources/valid_armada_document.yaml
+++ b/armada/tests/unit/resources/valid_armada_document.yaml
@@ -14,7 +14,7 @@ data:
   values: {}
   source:
     type: git
-    location: https://git.openstack.org/openstack/openstack-helm
+    location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
     reference: master
   dependencies: []
diff --git a/armada/tests/unit/utils/test_validate.py b/armada/tests/unit/utils/test_validate.py
index 1ce858da..9b7be002 100644
--- a/armada/tests/unit/utils/test_validate.py
+++ b/armada/tests/unit/utils/test_validate.py
@@ -185,7 +185,7 @@ data:
     source:
       reference: master
       subpath: helm-toolkit
-      location: https://git.openstack.org/openstack/openstack-helm
+      location: https://git.openstack.org/openstack/openstack-helm-infra
       type: git
     namespace: helm-toolkit
     upgrade:
diff --git a/examples/keystone-manifest.yaml b/examples/keystone-manifest.yaml
index 4047ebbd..63d30b84 100644
--- a/examples/keystone-manifest.yaml
+++ b/examples/keystone-manifest.yaml
@@ -14,7 +14,7 @@ data:
   values: {}
   source:
     type: git
-    location: https://git.openstack.org/openstack/openstack-helm
+    location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
     reference: master
   dependencies: []
diff --git a/examples/tar_example.yaml b/examples/tar_example.yaml
index 27591ee6..a0f13249 100644
--- a/examples/tar_example.yaml
+++ b/examples/tar_example.yaml
@@ -10,7 +10,7 @@ data:
   values: {}
   source:
     type: git
-    location: git://github.com/openstack/openstack-helm
+    location: git://github.com/openstack/openstack-helm-infra
     subpath: helm-toolkit
     reference: master
   dependencies: []
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 8c203dbe..bf83092c 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Script to setup helm-toolkit and helm dep up the shipyard chart
+# Script to setup helm-toolkit and helm dep up the armada chart
 #
 HELM=$1
 
@@ -44,8 +44,8 @@ function helm_serve {
 
 mkdir -p build
 cd build
-git clone --depth 1 https://git.openstack.org/openstack/openstack-helm.git || true
-cd openstack-helm
+git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true
+cd openstack-helm-infra
 git pull
 helm_serve
 make charts