diff --git a/.gitreview b/.gitreview
index 463987619..d8aea9649 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=x/packstack.git
+defaultbranch=stable/2023.2
diff --git a/Puppetfile b/Puppetfile
index 235101ad8..c586750a0 100755
--- a/Puppetfile
+++ b/Puppetfile
@@ -4,95 +4,95 @@ moduledir '/usr/share/openstack-puppet/modules'
 
 mod 'aodh',
   :git => 'https://github.com/openstack/puppet-aodh',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'ceilometer',
   :git => 'https://github.com/openstack/puppet-ceilometer',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'cinder',
   :git => 'https://github.com/openstack/puppet-cinder',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'glance',
   :git => 'https://github.com/openstack/puppet-glance',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'gnocchi',
   :git => 'https://github.com/openstack/puppet-gnocchi',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'heat',
   :git => 'https://github.com/openstack/puppet-heat',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'magnum',
   :git => 'https://github.com/openstack/puppet-magnum',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'horizon',
   :git => 'https://github.com/openstack/puppet-horizon',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'ironic',
   :git => 'https://github.com/openstack/puppet-ironic',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'keystone',
   :git => 'https://github.com/openstack/puppet-keystone',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'manila',
   :git => 'https://github.com/openstack/puppet-manila',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'neutron',
   :git => 'https://github.com/openstack/puppet-neutron',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'nova',
   :git => 'https://github.com/openstack/puppet-nova',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'openstack_extras',
   :git => 'https://github.com/openstack/puppet-openstack_extras',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'openstacklib',
   :git => 'https://github.com/openstack/puppet-openstacklib',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'oslo',
   :git => 'https://github.com/openstack/puppet-oslo',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'ovn',
   :git => 'https://github.com/openstack/puppet-ovn',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'placement',
   :git => 'https://github.com/openstack/puppet-placement',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'sahara',
-  :git => 'https://github.com/openstack/puppet-sahara',
-  :ref => 'master'
+  :git => 'https://github.com/openstack-archive/puppet-sahara',
+  :ref => 'stable/2023.2'
 
 mod 'swift',
   :git => 'https://github.com/openstack/puppet-swift',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'tempest',
   :git => 'https://github.com/openstack/puppet-tempest',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'trove',
   :git => 'https://github.com/openstack/puppet-trove',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 mod 'vswitch',
   :git => 'https://github.com/openstack/puppet-vswitch',
-  :ref => 'master'
+  :ref => 'stable/2023.2'
 
 ## Non-OpenStack modules
 
@@ -162,5 +162,5 @@ mod 'vcsrepo',
 
 mod 'xinetd',
   :git => 'https://github.com/puppetlabs/puppetlabs-xinetd',
-  :ref => 'master'
+  :ref => 'main'
 
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp b/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp
index a36baa1aa..8dfd1f58b 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp
@@ -51,5 +51,6 @@
       bridge_interface_mappings => $bridge_uplinks,
       ovn_encap_ip              => force_ip($localip),
       hostname                  => $::fqdn,
+      ovn_cms_options           => 'enable-chassis-as-gw',
     }
 }
diff --git a/playbooks/packstack-centos9-pre.yaml b/playbooks/packstack-centos9-pre.yaml
index a80e72895..9a9b12798 100644
--- a/playbooks/packstack-centos9-pre.yaml
+++ b/playbooks/packstack-centos9-pre.yaml
@@ -27,3 +27,10 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       become: true
       environment: '{{ zuul }}'
+
+    # mariadb-10.11 is broken https://issues.redhat.com/browse/RDO-241
+    - name: Temporary disable mariadb module
+      shell: "sudo dnf module disable -y mariadb"
+      when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "9"
+      become: true
+      changed_when: False