diff --git a/.zuul.yaml b/.zuul.yaml
index 75b5c240c..2b59d79ed 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -182,9 +182,9 @@
     vars:
       site: airskiff
       HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz
-      HTK_COMMIT: ae91cf3fc3f288b6d92ace4a3a405606a653638f
-      OSH_INFRA_COMMIT: db3537e56b182a54e7f6931ce57e2a190714019b
-      OSH_COMMIT: 75c30f43db44218e7842611e880fd8d7a30fa79c
+      HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
+      OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
+      OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
diff --git a/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml b/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml
index dff8f531b..cd0f9fc34 100644
--- a/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml
+++ b/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml
@@ -95,6 +95,14 @@ data:
     monitoring:
       prometheus:
         enabled: true
-  dependencies:
-    - osh-helm-toolkit
+    conf:
+      galera:
+        cluster_leader_ttl: 60
+    manifests:
+      deployment_ingress: false
+      deployment_error: false
+      service_ingress: false
+      configmap_ingress_conf: false
+      configmap_ingress_etc: false
+      service_error: false
 ...
diff --git a/global/software/charts/osh/openstack-mariadb/mariadb.yaml b/global/software/charts/osh/openstack-mariadb/mariadb.yaml
index 48a930dfa..13e57aa19 100644
--- a/global/software/charts/osh/openstack-mariadb/mariadb.yaml
+++ b/global/software/charts/osh/openstack-mariadb/mariadb.yaml
@@ -97,4 +97,14 @@ data:
     monitoring:
       prometheus:
         enabled: true
+    conf:
+      galera:
+        cluster_leader_ttl: 60
+    manifests:
+      deployment_ingress: false
+      deployment_error: false
+      service_ingress: false
+      configmap_ingress_conf: false
+      configmap_ingress_etc: false
+      service_error: false
 ...
diff --git a/global/software/charts/ucp/core/mariadb.yaml b/global/software/charts/ucp/core/mariadb.yaml
index b7f0ec533..b8648bdb8 100644
--- a/global/software/charts/ucp/core/mariadb.yaml
+++ b/global/software/charts/ucp/core/mariadb.yaml
@@ -80,4 +80,14 @@ data:
       error_server:
         node_selector_key: ucp-control-plane
         node_selector_value: enabled
+    conf:
+      galera:
+        cluster_leader_ttl: 60
+    manifests:
+      deployment_ingress: false
+      deployment_error: false
+      service_ingress: false
+      configmap_ingress_conf: false
+      configmap_ingress_etc: false
+      service_error: false
 ...
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 51bfec328..e5a24f2a7 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -17,7 +17,7 @@ data:
           type: tar
       controller-manager:
         location: http://control-plane.minikube.internal:8282/controller_manager.tgz
-        subpath: controller_managerin
+        subpath: controller_manager
         type: tar
       coredns:
         location: http://control-plane.minikube.internal:8282/etcd.tgz
diff --git a/tools/deployment/airskiff/developer/000-clone-dependencies.sh b/tools/deployment/airskiff/developer/000-clone-dependencies.sh
index 60a27ab08..c964a23b3 100755
--- a/tools/deployment/airskiff/developer/000-clone-dependencies.sh
+++ b/tools/deployment/airskiff/developer/000-clone-dependencies.sh
@@ -18,8 +18,8 @@
 set -xe
 
 : "${INSTALL_PATH:="../"}"
-: "${OSH_COMMIT:="75c30f43db44218e7842611e880fd8d7a30fa79c"}"
-: "${OSH_INFRA_COMMIT:="db3537e56b182a54e7f6931ce57e2a190714019b"}"
+: "${OSH_COMMIT:="2d9457e34ca4200ed631466bd87569b0214c92e7"}"
+: "${OSH_INFRA_COMMIT:="cfff60ec10a6c386f38db79bb9f59a552c2b032f"}"
 : "${CLONE_ARMADA:=true}"
 : "${CLONE_DECKHAND:=true}"
 : "${CLONE_SHIPYARD:=true}"
diff --git a/type/skiff/config/endpoints.yaml b/type/skiff/config/endpoints.yaml
index a4620475c..851e08fce 100644
--- a/type/skiff/config/endpoints.yaml
+++ b/type/skiff/config/endpoints.yaml
@@ -81,7 +81,7 @@ data:
     oslo_db:
       hosts:
         default: mariadb
-        discovery: mariadb-discovery
+        primary: mariadb
       host_fqdn_override:
         default: null
       path: /DB_NAME
@@ -368,7 +368,7 @@ data:
     oslo_db:
       hosts:
         default: mariadb
-        discovery: mariadb-discovery
+        primary: mariadb
       host_fqdn_override:
         default: null
       path: /DB_NAME
@@ -775,6 +775,7 @@ data:
       namespace: osh-infra
       hosts:
         default: mariadb
+        primary: mariadb
       host_fqdn_override:
         default: null
       path: /DB_NAME