diff --git a/.gitignore b/.gitignore
index 2adb41cc..cdab078b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,6 +84,9 @@ celerybeat-schedule
 # dotenv
 .env
 
+# devcontainers
+.devcontainer/
+
 # virtualenv
 .venv
 venv/
diff --git a/.zuul.yaml b/.zuul.yaml
index 0d0bc0ff..0c0cb582 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -140,11 +140,11 @@
     name: pegleg-base
     abstract: true
     roles:
-      - zuul: openstack/openstack-helm-infra
+      - zuul: airship/kubernetes-entrypoint
+      - zuul: openstack/openstack-helm
       - zuul: zuul/zuul-jobs
     required-projects:
       - name: openstack/openstack-helm
-      - name: openstack/openstack-helm-infra
       - name: openstack/openstack-helm-plugin
       - name: airship/treasuremap
         override-checkout: v1.9
@@ -183,8 +183,8 @@
       loopback_device: /dev/loop100
       loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
       ceph_osd_data_device: /dev/loop100
-      kube_version_repo: "v1.30"
-      kube_version: "1.30.3-1.1"
+      kube_version_repo: "v1.32"
+      kube_version: "1.32.1-1.1"
       calico_setup: true
       calico_version: "v3.27.4"
       cilium_setup: false
@@ -194,9 +194,9 @@
       helm_version: "v3.15.4"
       crictl_version: "v1.30.1"
       zuul_osh_relative_path: ../../openstack/openstack-helm
-      zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra
+      zuul_osh_infra_relative_path: ../../openstack/openstack-helm
       zuul_treasuremap_relative_path: ../../airship/treasuremap
-      gate_scripts_relative_path: ../../openstack/openstack-helm-infra
+      gate_scripts_relative_path: ../../openstack/openstack-helm
       run_helm_tests: "no"
 
 - job:
@@ -211,9 +211,9 @@
     vars:
       site: airskiff
       HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
-      HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
-      OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
-      OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
+      HTK_COMMIT: master
+      OSH_INFRA_COMMIT: master
+      OSH_COMMIT: master
       DISTRO: ubuntu_jammy
       DOCKER_REGISTRY: localhost:5000
       MAKE_PEGLEG_IMAGES: true