diff --git a/.gitignore b/.gitignore
index 8667c96..170bae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,8 @@ build/
 *.tgz
 
 # devcontainer
-.devcontainer/
\ No newline at end of file
+.devcontainer/
+
+.vscode/
+
+charts/deps
\ No newline at end of file
diff --git a/.zuul.yaml b/.zuul.yaml
index 51b6cd0..0f5e21a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,13 +16,13 @@
         - airship-maas-lint-ws
         - airship-maas-chart-build-gate
         - airship-maas-chart-build-latest-htk
-        - airship-maas-docker-build-gate
+        - airship-maas-docker-build-gate-bionic
         - airship-maas-lint-yaml
     gate:
       jobs:
         - airship-maas-lint-ws
         - airship-maas-chart-build-gate
-        - airship-maas-docker-build-gate
+        - airship-maas-docker-build-gate-bionic
         - airship-maas-lint-yaml
     post:
       jobs:
@@ -35,6 +35,12 @@
       - name: primary
         label: ubuntu-bionic
 
+- nodeset:
+    name: airship-maas-single-node-jammy
+    nodes:
+      - name: primary
+        label: ubuntu-jammy
+
 - job:
     name: airship-maas-lint-ws
     description: |
@@ -49,6 +55,8 @@
     run: tools/gate/playbooks/helm-linter.yaml
     timeout: 600
     nodeset: airship-maas-single-node
+    vars:
+      HTK_COMMIT: 49c117443391cec75e0bd52bb4a9d033325927ad
 
 - job:
     name: airship-maas-chart-build-latest-htk
@@ -61,7 +69,7 @@
       HTK_COMMIT: master
 
 - job:
-    name: airship-maas-docker-build-gate
+    name: airship-maas-docker-build-gate-bionic
     timeout: 1800
     run: tools/gate/playbooks/docker-image-build.yaml
     nodeset: airship-maas-single-node
@@ -78,7 +86,7 @@
     voting: true
     timeout: 900
     run: tools/gate/playbooks/lint-yaml.yaml
-    nodeset: ubuntu-bionic
+    nodeset: airship-maas-single-node
     irrelevant-files:
       - '^charts/maas/templates/.*'
 
diff --git a/tools/helm_install.sh b/tools/helm_install.sh
index 916d004..b7b771a 100755
--- a/tools/helm_install.sh
+++ b/tools/helm_install.sh
@@ -17,7 +17,7 @@
 set -x
 
 HELM=$1
-HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.9.4-linux-amd64.tar.gz"}
+HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz"}
 
 
 function install_helm_binary {