diff --git a/devstack/settings b/devstack/settings
index 515271ed31..7db2c5427a 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -100,7 +100,7 @@ if [ "$TROVE_ENABLE_LOCAL_REGISTRY" == "True" ] ; then
 else
     TROVE_DATABASE_IMAGE_MYSQL=${TROVE_DATABASE_IMAGE_MYSQL:-"docker.io/library/mysql"}
     TROVE_DATABASE_IMAGE_MARIADB=${TROVE_DATABASE_IMAGE_MARIAD:-"docker.io/library/mariadb"}
-    TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"catalystcloud/postgres"}
+    TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"docker.io/library/postgres"}
     TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-""}
-    TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"catalystcloud/db-backup-postgresql:1.1.2"}
+    TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-""}
 fi
\ No newline at end of file
diff --git a/zuul.d/deprecated_jobs.yaml b/zuul.d/deprecated_jobs.yaml
new file mode 100644
index 0000000000..5d74feff52
--- /dev/null
+++ b/zuul.d/deprecated_jobs.yaml
@@ -0,0 +1,332 @@
+- job:
+    name: trove-devstack-base
+    parent: devstack
+    abstract: true
+    timeout: 10800
+    required-projects:
+      - openstack/tempest
+      - openstack/diskimage-builder
+      - openstack/tripleo-image-elements
+      - openstack/trove
+      - openstack/trove-dashboard
+    vars:
+      devstack_services:
+        tempest: true
+        etcd3: false
+        ceilometer-acentral: false
+        ceilometer-acompute: false
+        ceilometer-alarm-evaluator: false
+        ceilometer-alarm-notifier: false
+        ceilometer-anotification: false
+        ceilometer-api: false
+        ceilometer-collector: false
+        q-svc: true
+        q-agt: true
+        q-dhcp: true
+        q-l3: true
+        q-meta: true
+        q-ovn-metadata-agent: false
+        ovn-controller: false
+        ovn-northd: false
+      devstack_plugins:
+        trove: https://opendev.org/openstack/trove
+      # NOTE(zhaochao): we have to override the default settings from the
+      # the base devstack job about "SERVICE_HOST" and "HOST_IP", as trove
+      # guestagent should use public addresses to access the underlying
+      # components(MQ and Swift), and the previous devstack-gate jobs didn't
+      # set these variables. However we cannot unset variables in job
+      # definition, so we just set SERVICE_HOST and HOST_IP to empty strings,
+      # and VNCSERVER_PROXYCLIENT_ADDRESS to 127.0.0.1 instead.
+      devstack_localrc:
+        SERVICE_HOST: ''
+        HOST_IP: ''
+        VNCSERVER_PROXYCLIENT_ADDRESS: 127.0.0.1
+        USE_PYTHON3: True
+        Q_AGENT: openvswitch
+        Q_PLUGIN: ml2
+        Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
+        TROVE_ENABLE_LOCAL_REGISTRY: True
+        TROVE_DATASTORE_VERSION: 5.7
+    run: playbooks/trove-devstack-base.yaml
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^releasenotes/.*$
+      - ^tools/.*$
+      - ^trove/hacking/.*$
+      - ^trove/tests/unittests/.*$
+
+- job:
+    name: trove-fakemodetests-base
+    parent: openstack-tox-py36
+    abstract: true
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^contrib/.*$
+      - ^doc/.*$
+      - ^releasenotes/.*$
+      - ^setup.cfg$
+      - ^tools/.*$
+      - ^trove/hacking/.*$
+      - ^trove/tests/api/.*$
+      - ^trove/tests/db/.*$
+      - ^trove/tests/scenario/.*$
+      - ^trove/tests/unittests/.*$
+
+- job:
+    name: trove-functional-mysql
+    parent: trove-devstack-base
+    nodeset: trove-ubuntu-jammy
+    timeout: 10800
+    vars:
+      devstack_localrc:
+        TROVE_RESIZE_TIME_OUT: 1800
+      trove_resize_time_out: 1800
+      trove_test_datastore: 'mysql'
+      trove_test_group: 'mysql'
+      trove_test_datastore_version: '5.7.29'
+
+- job:
+    name: trove-functional-mysql-nondev
+    parent: trove-devstack-base
+    vars:
+      devstack_localrc:
+        TROVE_RESIZE_TIME_OUT: 1800
+        TROVE_NON_DEV_IMAGE_URL: https://tarballs.opendev.org/openstack/trove/images/trove-master-mysql-ubuntu-jammy.qcow2
+      trove_resize_time_out: 1800
+      trove_test_datastore: 'mysql'
+      trove_test_group: 'mysql'
+      trove_test_datastore_version: '5.7.29'
+
+- job:
+    name: trove-scenario-cassandra-single
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: cassandra
+      trove_test_group: cassandra-supported-single
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-cassandra-multi
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: cassandra
+      trove_test_group: cassandra-supported-multi
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-couchdb-single
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: couchdb
+      trove_test_group: couchdb-supported-single
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-couchbase-single
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: couchbase
+      trove_test_group: couchbase-supported-single
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-mariadb-single
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: mariadb
+      trove_test_group: mariadb-supported-single
+      trove_test_datastore_version: 10.4.12
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-mariadb-multi
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: mariadb
+      trove_test_group: mariadb-supported-multi
+      trove_test_datastore_version: 10.4.12
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-mysql-single
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: mysql
+      trove_test_group: mysql-supported-single
+      trove_test_datastore_version: 5.7.29
+
+- job:
+    name: trove-scenario-mysql-multi
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: mysql
+      trove_test_group: mysql-supported-multi
+      trove_test_datastore_version: 5.7.29
+
+- job:
+    name: trove-scenario-percona-multi
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: percona
+      trove_test_group: percona-supported-multi
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-percona-single
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: percona
+      trove_test_group: percona-supported-single
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-postgresql-single
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: postgresql
+      trove_test_group: postgresql-supported-single
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-postgresql-multi
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: postgresql
+      trove_test_group: postgresql-supported-multi
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-pxc-single
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: pxc
+      trove_test_group: pxc-supported-single
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-pxc-multi
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: pxc
+      trove_test_group: pxc-supported-multi
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-redis-single
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: redis
+      trove_test_group: redis-supported-single
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-scenario-redis-multi
+    parent: trove-devstack-base
+    vars:
+      trove_test_datastore: redis
+      trove_test_group: redis-supported-multi
+      devstack_localrc:
+        TROVE_ENABLE_IMAGE_BUILD: false
+
+- job:
+    name: trove-tempest-postgres
+    parent: devstack-tempest
+    nodeset: trove-ubuntu-jammy
+    timeout: 10800
+    required-projects:
+      - openstack/trove
+      - openstack/trove-tempest-plugin
+      - openstack/tempest
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^tox.ini
+      - ^LICENSE$
+      - ^contrib/
+      - ^zuul\.d/
+      - ^\..+
+      - ^trove/guestagent/(mysql.*|mariadb)/.*$
+      - ^trove/guestagent/strategies/replication/(mysql.*|mariadb.*)\.py$
+    vars:
+      tox_envlist: all
+      tempest_concurrency: 1
+      devstack_localrc:
+        TEMPEST_PLUGINS: /opt/stack/trove-tempest-plugin
+        USE_PYTHON3: true
+        Q_AGENT: openvswitch
+        Q_PLUGIN: ml2
+        Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
+        TROVE_DATASTORE_TYPE: postgresql
+        TROVE_DATASTORE_VERSION: 12
+        TROVE_ENABLE_LOCAL_REGISTRY: True
+        SYNC_LOG_TO_CONTROLLER: True
+      devstack_local_conf:
+        post-config:
+          $TROVE_CONF:
+            DEFAULT:
+              usage_timeout: 1800
+        test-config:
+          $TEMPEST_CONFIG:
+            auth:
+              tempest_roles: ResellerAdmin
+            database:
+              enabled_datastores: "postgresql"
+              default_datastore_versions: "postgresql:12"
+      devstack_plugins:
+        trove: https://opendev.org/openstack/trove.git
+      devstack_services:
+        etcd3: false
+        ceilometer-acentral: false
+        ceilometer-acompute: false
+        ceilometer-alarm-evaluator: false
+        ceilometer-alarm-notifier: false
+        ceilometer-anotification: false
+        ceilometer-api: false
+        ceilometer-collector: false
+        cinder: true
+        c-sch: true
+        c-api: true
+        c-vol: true
+        c-bak: false
+        swift: true
+        s-account: true
+        s-container: true
+        s-object: true
+        s-proxy: true
+        tls-proxy: false
+        tempest: true
+        q-svc: true
+        q-agt: true
+        q-dhcp: true
+        q-l3: true
+        q-meta: true
+        q-ovn-metadata-agent: false
+        ovn-controller: false
+        ovn-northd: false
+      tempest_test_regex: ^trove_tempest_plugin\.tests
+      tempest_test_timeout: 3600
+      tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/trove-tempest-plugin"].src_dir }}/tempest_exclude_list.txt'
+      zuul_copy_output:
+        '/var/log/guest-agent-logs/': 'logs'
\ No newline at end of file
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index f9a52bbaf8..1038f82b8c 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,250 +1,3 @@
-- job:
-    name: trove-devstack-base
-    parent: devstack
-    abstract: true
-    timeout: 10800
-    required-projects:
-      - openstack/tempest
-      - openstack/diskimage-builder
-      - openstack/tripleo-image-elements
-      - openstack/trove
-      - openstack/trove-dashboard
-    vars:
-      devstack_services:
-        tempest: true
-        etcd3: false
-        ceilometer-acentral: false
-        ceilometer-acompute: false
-        ceilometer-alarm-evaluator: false
-        ceilometer-alarm-notifier: false
-        ceilometer-anotification: false
-        ceilometer-api: false
-        ceilometer-collector: false
-        q-svc: true
-        q-agt: true
-        q-dhcp: true
-        q-l3: true
-        q-meta: true
-        q-ovn-metadata-agent: false
-        ovn-controller: false
-        ovn-northd: false
-      devstack_plugins:
-        trove: https://opendev.org/openstack/trove
-      # NOTE(zhaochao): we have to override the default settings from the
-      # the base devstack job about "SERVICE_HOST" and "HOST_IP", as trove
-      # guestagent should use public addresses to access the underlying
-      # components(MQ and Swift), and the previous devstack-gate jobs didn't
-      # set these variables. However we cannot unset variables in job
-      # definition, so we just set SERVICE_HOST and HOST_IP to empty strings,
-      # and VNCSERVER_PROXYCLIENT_ADDRESS to 127.0.0.1 instead.
-      devstack_localrc:
-        SERVICE_HOST: ''
-        HOST_IP: ''
-        VNCSERVER_PROXYCLIENT_ADDRESS: 127.0.0.1
-        USE_PYTHON3: True
-        Q_AGENT: openvswitch
-        Q_PLUGIN: ml2
-        Q_ML2_TENANT_NETWORK_TYPE: vxlan
-        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
-        TROVE_ENABLE_LOCAL_REGISTRY: True
-        TROVE_DATASTORE_VERSION: 5.7
-    run: playbooks/trove-devstack-base.yaml
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^doc/.*$
-      - ^releasenotes/.*$
-      - ^tools/.*$
-      - ^trove/hacking/.*$
-      - ^trove/tests/unittests/.*$
-
-- job:
-    name: trove-fakemodetests-base
-    parent: openstack-tox-py36
-    abstract: true
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^contrib/.*$
-      - ^doc/.*$
-      - ^releasenotes/.*$
-      - ^setup.cfg$
-      - ^tools/.*$
-      - ^trove/hacking/.*$
-      - ^trove/tests/api/.*$
-      - ^trove/tests/db/.*$
-      - ^trove/tests/scenario/.*$
-      - ^trove/tests/unittests/.*$
-
-- job:
-    name: trove-functional-mysql
-    parent: trove-devstack-base
-    nodeset: trove-ubuntu-jammy
-    timeout: 10800
-    vars:
-      devstack_localrc:
-        TROVE_RESIZE_TIME_OUT: 1800
-      trove_resize_time_out: 1800
-      trove_test_datastore: 'mysql'
-      trove_test_group: 'mysql'
-      trove_test_datastore_version: '5.7.29'
-
-- job:
-    name: trove-functional-mysql-nondev
-    parent: trove-devstack-base
-    vars:
-      devstack_localrc:
-        TROVE_RESIZE_TIME_OUT: 1800
-        TROVE_NON_DEV_IMAGE_URL: https://tarballs.opendev.org/openstack/trove/images/trove-master-mysql-ubuntu-jammy.qcow2
-      trove_resize_time_out: 1800
-      trove_test_datastore: 'mysql'
-      trove_test_group: 'mysql'
-      trove_test_datastore_version: '5.7.29'
-
-- job:
-    name: trove-scenario-cassandra-single
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: cassandra
-      trove_test_group: cassandra-supported-single
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-cassandra-multi
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: cassandra
-      trove_test_group: cassandra-supported-multi
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-couchdb-single
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: couchdb
-      trove_test_group: couchdb-supported-single
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-couchbase-single
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: couchbase
-      trove_test_group: couchbase-supported-single
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-mariadb-single
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: mariadb
-      trove_test_group: mariadb-supported-single
-      trove_test_datastore_version: 10.4.12
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-mariadb-multi
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: mariadb
-      trove_test_group: mariadb-supported-multi
-      trove_test_datastore_version: 10.4.12
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-mysql-single
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: mysql
-      trove_test_group: mysql-supported-single
-      trove_test_datastore_version: 5.7.29
-
-- job:
-    name: trove-scenario-mysql-multi
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: mysql
-      trove_test_group: mysql-supported-multi
-      trove_test_datastore_version: 5.7.29
-
-- job:
-    name: trove-scenario-percona-multi
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: percona
-      trove_test_group: percona-supported-multi
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-percona-single
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: percona
-      trove_test_group: percona-supported-single
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-postgresql-single
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: postgresql
-      trove_test_group: postgresql-supported-single
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-postgresql-multi
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: postgresql
-      trove_test_group: postgresql-supported-multi
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-pxc-single
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: pxc
-      trove_test_group: pxc-supported-single
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-pxc-multi
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: pxc
-      trove_test_group: pxc-supported-multi
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-redis-single
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: redis
-      trove_test_group: redis-supported-single
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
-- job:
-    name: trove-scenario-redis-multi
-    parent: trove-devstack-base
-    vars:
-      trove_test_datastore: redis
-      trove_test_group: redis-supported-multi
-      devstack_localrc:
-        TROVE_ENABLE_IMAGE_BUILD: false
-
 - job:
     name: trove-tox-bandit-baseline
     parent: openstack-tox
@@ -367,6 +120,7 @@
       - ^zuul\.d/
       - ^backup/
       - ^\..+
+      - ^trove/guestagent/strategies/replication/
     vars:
       devstack_services:
         swift: false
@@ -379,6 +133,19 @@
 - job:
     name: trove-tempest-ubuntu-backup
     parent: trove-tempest
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^tox.ini$
+      - ^LICENSE$
+      - ^contrib/
+      - ^zuul\.d/
+      - ^\..+
+      - ^trove/guestagent/strategies/replication/
     vars:
       devstack_localrc:
         TROVE_ENABLE_LOCAL_REGISTRY: True
@@ -408,6 +175,21 @@
 - job:
     name: trove-tempest-ubuntu-base-mysql5.7
     parent: trove-tempest-ubuntu-base
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^tox.ini$
+      - ^LICENSE$
+      - ^contrib/
+      - ^zuul\.d/
+      - ^backup/
+      - ^\..+
+      - ^trove/guestagent/strategies/replication/
+      - ^trove/guestagent/datastore/(postgres|mariadb)/.*$
     vars:
         devstack_localrc:
           TROVE_DATASTORE_VERSION: 5.7
@@ -420,6 +202,20 @@
 - job:
     name: trove-tempest-ubuntu-backup-mysql5.7
     parent: trove-tempest-ubuntu-backup
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^tox.ini$
+      - ^LICENSE$
+      - ^contrib/
+      - ^zuul\.d/
+      - ^\..+
+      - ^trove/guestagent/strategies/replication/
+      - ^trove/guestagent/datastore/(postgres|mariadb)/.*$
     vars:
         devstack_localrc:
           TROVE_DATASTORE_VERSION: 5.7
@@ -432,6 +228,21 @@
 - job:
     name: trove-tempest-ubuntu-replication-mysql5.7
     parent: trove-tempest-ubuntu-replication
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^tox.ini$
+      - ^LICENSE$
+      - ^contrib/
+      - ^zuul\.d/
+      - ^backup/
+      - ^\..+
+      - ^trove/guestagent/datastore/(postgres|mariadb)/.*$
+      - ^trove/guestagent/strategies/replication/(postgresql.*|mariadb.*)\.py$
     vars:
         devstack_localrc:
           TROVE_DATASTORE_VERSION: 5.7
@@ -444,6 +255,21 @@
 - job:
     name: trove-tempest-ubuntu-base-mariadb10.4
     parent: trove-tempest-ubuntu-base
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^tox.ini$
+      - ^LICENSE$
+      - ^contrib/
+      - ^zuul\.d/
+      - ^backup/
+      - ^\..+
+      - ^trove/guestagent/strategies/replication/
+      - ^trove/guestagent/datastore/(mysql.*|postgres)/.*$
     vars:
         devstack_localrc:
           TROVE_DATASTORE_TYPE: mariadb
@@ -458,6 +284,20 @@
 - job:
     name: trove-tempest-ubuntu-backup-mariadb10.4
     parent: trove-tempest-ubuntu-backup
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^tox.ini$
+      - ^LICENSE$
+      - ^contrib/
+      - ^zuul\.d/
+      - ^\..+
+      - ^trove/guestagent/strategies/replication/
+      - ^trove/guestagent/datastore/(mysql.*|postgres)/.*$
     vars:
         devstack_localrc:
           TROVE_DATASTORE_TYPE: mariadb
@@ -472,6 +312,21 @@
 - job:
     name: trove-tempest-ubuntu-replication-mariadb10.4
     parent: trove-tempest-ubuntu-replication
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^tox.ini$
+      - ^LICENSE$
+      - ^contrib/
+      - ^zuul\.d/
+      - ^backup/
+      - ^\..+
+      - ^trove/guestagent/datastore/(mysql.*|postgres)/.*$
+      - ^trove/guestagent/strategies/replication/(postgresql.*|mysql.*)\.py$
     vars:
         devstack_localrc:
           TROVE_DATASTORE_TYPE: mariadb
@@ -484,14 +339,8 @@
                 default_datastore_versions: mariadb:10.4
 
 - job:
-    name: trove-tempest-postgres
-    parent: devstack-tempest
-    nodeset: trove-ubuntu-jammy
-    timeout: 10800
-    required-projects:
-      - openstack/trove
-      - openstack/trove-tempest-plugin
-      - openstack/tempest
+    name: trove-tempest-ubuntu-base-postgresql12
+    parent: trove-tempest-ubuntu-base
     irrelevant-files:
       - ^.*\.rst$
       - ^api-ref/.*$
@@ -499,75 +348,81 @@
       - ^etc/.*$
       - ^releasenotes/.*$
       - ^test-requirements.txt$
-      - ^tox.ini
+      - ^tox.ini$
+      - ^LICENSE$
+      - ^contrib/
+      - ^zuul\.d/
+      - ^backup/
+      - ^\..+
+      - ^trove/guestagent/strategies/replication/
+      - ^trove/guestagent/datastore/(mysql.*|mariadb)/.*$
+    vars:
+        devstack_localrc:
+          TROVE_DATASTORE_TYPE: postgresql
+          TROVE_DATASTORE_VERSION: 12
+        devstack_local_conf:
+          test-config:
+            $TEMPEST_CONFIG:
+              database:
+                enabled_datastores: "postgresql"
+                default_datastore_versions: postgresql:12
+
+- job:
+    name: trove-tempest-ubuntu-backup-postgresql12
+    parent: trove-tempest-ubuntu-backup
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^tox.ini$
       - ^LICENSE$
       - ^contrib/
       - ^zuul\.d/
       - ^\..+
-      - ^trove/guestagent/(mysql.*|mariadb)/.*$
-      - ^trove/guestagent/strategies/replication/(mysql.*|mariadb.*)\.py$
+      - ^trove/guestagent/strategies/replication/
+      - ^trove/guestagent/datastore/(mysql.*|mariadb)/.*$
     vars:
-      tox_envlist: all
-      tempest_concurrency: 1
-      devstack_localrc:
-        TEMPEST_PLUGINS: /opt/stack/trove-tempest-plugin
-        USE_PYTHON3: true
-        Q_AGENT: openvswitch
-        Q_PLUGIN: ml2
-        Q_ML2_TENANT_NETWORK_TYPE: vxlan
-        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
-        TROVE_DATASTORE_TYPE: postgresql
-        TROVE_DATASTORE_VERSION: 12
-        TROVE_ENABLE_LOCAL_REGISTRY: True
-        SYNC_LOG_TO_CONTROLLER: True
-      devstack_local_conf:
-        post-config:
-          $TROVE_CONF:
-            DEFAULT:
-              usage_timeout: 1800
-        test-config:
-          $TEMPEST_CONFIG:
-            auth:
-              tempest_roles: ResellerAdmin
-            database:
-              enabled_datastores: "postgresql"
-              default_datastore_versions: "postgresql:12"
-      devstack_plugins:
-        trove: https://opendev.org/openstack/trove.git
-      devstack_services:
-        etcd3: false
-        ceilometer-acentral: false
-        ceilometer-acompute: false
-        ceilometer-alarm-evaluator: false
-        ceilometer-alarm-notifier: false
-        ceilometer-anotification: false
-        ceilometer-api: false
-        ceilometer-collector: false
-        cinder: true
-        c-sch: true
-        c-api: true
-        c-vol: true
-        c-bak: false
-        swift: true
-        s-account: true
-        s-container: true
-        s-object: true
-        s-proxy: true
-        tls-proxy: false
-        tempest: true
-        q-svc: true
-        q-agt: true
-        q-dhcp: true
-        q-l3: true
-        q-meta: true
-        q-ovn-metadata-agent: false
-        ovn-controller: false
-        ovn-northd: false
-      tempest_test_regex: ^trove_tempest_plugin\.tests
-      tempest_test_timeout: 3600
-      tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/trove-tempest-plugin"].src_dir }}/tempest_exclude_list.txt'
-      zuul_copy_output:
-        '/var/log/guest-agent-logs/': 'logs'
+        devstack_localrc:
+          TROVE_DATASTORE_TYPE: postgresql
+          TROVE_DATASTORE_VERSION: 12
+        devstack_local_conf:
+          test-config:
+            $TEMPEST_CONFIG:
+              database:
+                enabled_datastores: "postgresql"
+                default_datastore_versions: postgresql:12
+
+- job:
+    name: trove-tempest-ubuntu-replication-postgresql12
+    parent: trove-tempest-ubuntu-replication
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^tox.ini$
+      - ^LICENSE$
+      - ^contrib/
+      - ^zuul\.d/
+      - ^backup/
+      - ^\..+
+      - ^trove/guestagent/datastore/(mysql.*|mariadb)/.*$
+      - ^trove/guestagent/strategies/replication/(mariadb.*|mysql.*)\.py$
+    vars:
+        devstack_localrc:
+          TROVE_DATASTORE_TYPE: postgresql
+          TROVE_DATASTORE_VERSION: 12
+        devstack_local_conf:
+          test-config:
+            $TEMPEST_CONFIG:
+              database:
+                enabled_datastores: "postgresql"
+                default_datastore_versions: postgresql:12
 
 - job:
     name: publish-trove-guest-image
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 1fd0b27639..a9e19824a9 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -17,6 +17,9 @@
         - trove-tempest-ubuntu-base-mariadb10.4
         - trove-tempest-ubuntu-backup-mariadb10.4
         - trove-tempest-ubuntu-replication-mariadb10.4
+        - trove-tempest-ubuntu-base-postgresql12
+        - trove-tempest-ubuntu-backup-postgresql12
+        - trove-tempest-ubuntu-replication-postgresql12
         - openstack-tox-cover:
             voting: true
         - trove-tox-bandit-baseline:
@@ -27,16 +30,12 @@
             voting: true
     gate:
       jobs:
-        - trove-tempest:
-            voting: false
+        - trove-tempest-ubuntu-base-mysql5.7
+        - trove-tempest-ubuntu-base-mariadb10.4
+        - trove-tempest-ubuntu-base-postgresql12
     experimental:
       jobs:
         - trove-tempest-ipv6-only
-        - trove-functional-mysql
-        - trove-scenario-mysql-single
-        - trove-scenario-mysql-multi
-        - trove-scenario-mariadb-single
-        - trove-scenario-mariadb-multi
     periodic:
       jobs:
         - publish-trove-guest-image-ubuntu-jammy: