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 @@ class packstack::neutron::ovn_agent ()
       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