diff --git a/.zuul.yaml b/.zuul.yaml
index 246cf0a4..d218e3aa 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -220,6 +220,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/sleep.sh
     irrelevant-files: *irrelevant-files
 
 - job:
diff --git a/charts/shipyard/Chart.yaml b/charts/shipyard/Chart.yaml
index b0fa6211..13463b3e 100644
--- a/charts/shipyard/Chart.yaml
+++ b/charts/shipyard/Chart.yaml
@@ -16,7 +16,7 @@
 apiVersion: v1
 description: A Helm chart for Shipyard and Airflow
 name: shipyard
-version: 0.2.5
+version: 0.2.6
 appVersion: 2.8.2
 keywords:
 - shipyard
diff --git a/charts/shipyard/templates/ingress-airflow-webserver-ui.yaml b/charts/shipyard/templates/ingress-airflow-webserver-ui.yaml
index b93df8ac..0681ee28 100644
--- a/charts/shipyard/templates/ingress-airflow-webserver-ui.yaml
+++ b/charts/shipyard/templates/ingress-airflow-webserver-ui.yaml
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.ingress_shipyard_api .Values.network.airflow_webserver_ui.ingress.public }}
+{{- if and .Values.manifests.ingress_airflow_webserver_ui .Values.network.airflow_webserver_ui.ingress.public }}
 {{- $ingressOpts := dict "envAll" . "backendService" "airflow_webserver_ui" "backendServiceType" "airflow_webserver_ui" "backendPort" "api" -}}
 {{- $ingressOpts | include "helm-toolkit.manifests.ingress" -}}
 {{- end }}
diff --git a/charts/shipyard/values.yaml b/charts/shipyard/values.yaml
index b6f499e8..ac7d8101 100644
--- a/charts/shipyard/values.yaml
+++ b/charts/shipyard/values.yaml
@@ -1246,11 +1246,11 @@ manifests:
   # TODO: Set this to false only if a new deployment, or if the worker pod is
   #   running the scheduler
   deployment_airflow_scheduler: true
-  deployment_airflow_webserver_ui: true
+  deployment_airflow_webserver_ui: false
   deployment_shipyard: true
   statefulset_airflow_worker: true
   ingress_shipyard_api: true
-  ingress_airflow_webserver_ui: true
+  ingress_airflow_webserver_ui: false
   job_shipyard_db_init: true
   job_shipyard_db_auxiliary: true
   job_shipyard_db_sync: true
@@ -1260,8 +1260,9 @@ manifests:
   job_ks_endpoints: true
   job_ks_service: true
   job_ks_user: true
-  secret_apache_etc: true
-  secret_airflow_webserver_ui: true
+  secret_apache_etc: false
+  secret_airflow_webserver_ui: false
+  secret_airflow_webserver_ui_ingress_tls: false
   secret_airflow_db: true
   secret_shipyard_db: true
   secret_ingress_tls: true
@@ -1269,8 +1270,7 @@ manifests:
   secret_rabbitmq: true
   service_shipyard: true
   service_shipyard_ingress: true
-  service_airflow_webserver_ui: true
-  service_airflow_webserver_ui_ingress: true
+  service_airflow_webserver_ui: false
   service_airflow_worker: true
   service_discovery_airflow_worker: true
   test_shipyard_api: true
diff --git a/tools/gate/playbooks/prepare-hosts.yaml b/tools/gate/playbooks/prepare-hosts.yaml
index e7e3d9c9..f74050d7 100644
--- a/tools/gate/playbooks/prepare-hosts.yaml
+++ b/tools/gate/playbooks/prepare-hosts.yaml
@@ -13,6 +13,10 @@
 ---
 - hosts: all
   roles:
+    - role: add-authorized-keys
+      public_keys:
+        - public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDA7eM8WFJrqQmki8rR0O3QBHyl8xq42jb1RduwuRwjWoGYJI5cX7Fx+7VR4A9ITCoiqxKS8DMfgKbt5jKC6SmvMALULZsnYlthB34KywurgxsW6fgp68DHWQ7J4CCBhoIpl0W3JW7s6b0vHLhab59r0E+AYemBVuWUqbFEy8nDAHcQv1S/2o1udhmljIN7c2ogO4KAJ7Lge0BoIP9ps4u6AVwyQZixp4anU9DHGNA/UQj4M5UyuALj5buEAuATBe9Vqj4sOvZjObPJAGPUrNRrGEWAFk+lSZHRzKXo0eeWtPqoh5UN9UDb5Pocg1krncMIZwjHKovlD1z/O1y91aY5LM1wxm/7aaIiX8eCihyVZaOuDCLF7WDT2SMs7ABcotX2MDtVQTrNNV3MmMAScFNDflzPKszd7cdjLl6PBq8bvPxmCkLmnitPTGOoh9d8i+JlbINvgx1pguYrpeciIyreCO1rjTW3MgB0tyoMEa31V+7HrauBMeNnE68YTqLTIB0= smarkin@mirantis.com
+
     - bindep
     - start-zuul-console
 ...