diff --git a/.gitignore b/.gitignore
index 7f02333..e4f731c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ Dockerfile.cross
 *.swp
 *.swo
 *~
+.devcontainer/
\ No newline at end of file
diff --git a/.zuul.yaml b/.zuul.yaml
index a54890f..3755fc9 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -35,11 +35,11 @@
     name: armada-operator-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
@@ -91,9 +91,9 @@
       helm_version: "v3.14.0"
       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:
@@ -105,9 +105,9 @@
     vars:
       site: airskiff
       HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz
-      HTK_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714
-      OSH_INFRA_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714
-      OSH_COMMIT: 5a3f2080c12bb56238b150c69a06064c64d61d0f
+      HTK_COMMIT: master
+      OSH_INFRA_COMMIT: master
+      OSH_COMMIT: master
       CLONE_ARMADA_OPERATOR: false
       DISTRO: ubuntu_jammy
       DOCKER_REGISTRY: localhost:5000
@@ -130,6 +130,7 @@
         - ./tools/deployment/airskiff/developer/100-deploy-osh.sh
         - ./tools/deployment/airskiff/common/os-env.sh
         - ./tools/gate/wait-for-shipyard.sh
+        - ./tools/deployment/airskiff/common/get-airflow-worker-logs.sh
     irrelevant-files: *irrelevant-files
 
 - job:
diff --git a/tools/gate/playbooks/roles b/tools/gate/playbooks/roles
deleted file mode 120000
index d8c4472..0000000
--- a/tools/gate/playbooks/roles
+++ /dev/null
@@ -1 +0,0 @@
-../roles
\ No newline at end of file