diff --git a/tools/deployment/000-install-packages.sh b/tools/deployment/000-install-packages.sh
index b0c585f4..966ee73f 100755
--- a/tools/deployment/000-install-packages.sh
+++ b/tools/deployment/000-install-packages.sh
@@ -19,8 +19,8 @@
 set -xe
 
 : "${INSTALL_PATH:="../"}"
-: "${OSH_COMMIT:="884a734833cb69a933416d7a04db25581097673c"}"
-: "${OSH_INFRA_COMMIT:="3d8935a536faaa87e084e7783ed53f4660a3a1f8"}"
+: "${OSH_COMMIT:="2d9457e34ca4200ed631466bd87569b0214c92e7"}"
+: "${OSH_INFRA_COMMIT:="cfff60ec10a6c386f38db79bb9f59a552c2b032f"}"
 : "${CLONE_ARMADA:=false}"
 : "${CLONE_DECKHAND:=false}"
 : "${CLONE_SHIPYARD:=false}"
diff --git a/tools/deployment/040-mysqlclient-utility.sh b/tools/deployment/040-mysqlclient-utility.sh
index 1fe908e3..e29ba23e 100755
--- a/tools/deployment/040-mysqlclient-utility.sh
+++ b/tools/deployment/040-mysqlclient-utility.sh
@@ -26,9 +26,13 @@ secrets:
   mariadb:
     backup_restore: mariadb-backup-restore
 manifests:
-    cron_job_mariadb_backup: true
-    secret_backup_restore: true
-    pvc_backup: true
+  cron_job_mariadb_backup: true
+  secret_backup_restore: true
+  pvc_backup: true
+volume:
+  class_name: standard
+  backup:
+    class_name: standard
 EOF
 
 export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
diff --git a/tools/deployment/060-postgresql-utility.sh b/tools/deployment/060-postgresql-utility.sh
index 431f970f..415117c9 100755
--- a/tools/deployment/060-postgresql-utility.sh
+++ b/tools/deployment/060-postgresql-utility.sh
@@ -17,7 +17,29 @@ CURRENT_DIR="$(pwd)"
 
 # Deploy postgresql server
 cd "${OSH_INFRA_PATH}"
-bash -c "./tools/deployment/common/postgresql.sh"
+# bash -c "./tools/deployment/common/postgresql.sh"
+
+#NOTE: Lint and package chart
+make postgresql
+
+#NOTE: Deploy command
+: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL:="$(./tools/deployment/common/get-values-overrides.sh postgresql)"}
+
+helm upgrade --install postgresql ./postgresql \
+    --namespace=osh-infra \
+    --set monitoring.prometheus.enabled=true \
+    --set storage.pvc.size=1Gi \
+    --set storage.pvc.enabled=true \
+    --set pod.replicas.server=1 \
+    --set storage.pvc.class_name=standard \
+    --set storage.archive_pvc.class_name=standard \
+    ${OSH_INFRA_EXTRA_HELM_ARGS} \
+    ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL}
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh osh-infra
+
 bash -c "./tools/deployment/common/020-ingress.sh"
 # Deploy postgresql-utility
 cd ${CURRENT_DIR}
diff --git a/tools/gate/playbooks/make-functional-tests.yaml b/tools/gate/playbooks/make-functional-tests.yaml
index f99b694a..20ee7cc3 100644
--- a/tools/gate/playbooks/make-functional-tests.yaml
+++ b/tools/gate/playbooks/make-functional-tests.yaml
@@ -32,6 +32,3 @@
           failed_when: result.failed
         - debug:
             var: result
-
-- name: Include collecting running logs
-  import_playbook: airship-porthole-collect-logs.yaml
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 4daad326..856f68b4 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -163,16 +163,17 @@
         chdir: ../porthole
 
 - job:
-    name: airship-porthole-deploy-functional-tests-ubuntu_focal
-    description: |
-       Deploys all UC's and Executes functional tests on focal.
+    name: airship-porthole-deploy-functional-tests
+    abstract: true
+    description: Deploys all UC's and Executes functional tests
     nodeset: airship-porthole-focal-single-node
     timeout: 7200
     run:
       - tools/gate/playbooks/airship-porthole-gate-runner.yaml
       - tools/gate/playbooks/make-functional-tests.yaml
+    post-run:
+      - tools/gate/playbooks/airship-porthole-collect-logs.yaml
     vars:
-      distro_suffix: ubuntu_focal
       gate_scripts:
         - ./tools/deployment/005-calicoctl-utility.sh
         - ./tools/deployment/010-ceph-utility.sh
@@ -181,39 +182,29 @@
         - ./tools/deployment/040-mysqlclient-utility.sh
         - ./tools/deployment/050-openstack-utility.sh
         - ./tools/deployment/060-postgresql-utility.sh
+      args:
+        chdir: ../porthole
+
+- job:
+    name: airship-porthole-deploy-functional-tests-ubuntu_focal
+    parent: airship-porthole-deploy-functional-tests
+    vars:
+      distro_suffix: ubuntu_focal
       osh_params:
         openstack_release: yoga
         container_distro_name: ubuntu
         container_distro_version: focal
-      args:
-        chdir: ../porthole
-
 
 - job:
     name: airship-porthole-deploy-functional-tests-ubuntu_bionic
-    description: |
-       Deploys all UC's and Executes functions tests on bionic.
-    nodeset: airship-porthole-focal-single-node
-    timeout: 7200
-    run:
-      - tools/gate/playbooks/airship-porthole-gate-runner.yaml
-      - tools/gate/playbooks/make-functional-tests.yaml
+    parent: airship-porthole-deploy-functional-tests
     vars:
       distro_suffix: ubuntu_bionic
-      gate_scripts:
-        - ./tools/deployment/005-calicoctl-utility.sh
-        - ./tools/deployment/010-ceph-utility.sh
-        - ./tools/deployment/020-compute-utility.sh
-        - ./tools/deployment/030-etcdctl-utility.sh
-        - ./tools/deployment/040-mysqlclient-utility.sh
-        - ./tools/deployment/050-openstack-utility.sh
-        - ./tools/deployment/060-postgresql-utility.sh
       osh_params:
         openstack_release: yoga
         container_distro_name: ubuntu
         container_distro_version: bionic
-      args:
-        chdir: ../porthole
+
 
 - secret:
     name: quay_credentials