diff --git a/hack/ci/cloud-init/controller.yaml.tpl b/hack/ci/cloud-init/controller.yaml.tpl
index f1c864210f..ace4054679 100644
--- a/hack/ci/cloud-init/controller.yaml.tpl
+++ b/hack/ci/cloud-init/controller.yaml.tpl
@@ -48,6 +48,14 @@
     OVN_L3_CREATE_PUBLIC_NETWORK="True"
     Q_AGENT="ovn"
 
+    # WORKAROUND:
+    # 	https://github.com/kubernetes-sigs/cluster-api-provider-openstack/issues/2320
+    # 	OVN built from source using LTS versions. Should be removed once OVS is more stable without the pin.
+    # 	https://opendev.org/openstack/neutron/src/commit/83de306105f9329e24c97c4af6c3886de20e7d70/zuul.d/tempest-multinode.yaml#L603-L604
+    OVN_BUILD_FROM_SOURCE=True
+    OVN_BRANCH=branch-24.03
+    OVS_BRANCH=branch-3.3
+
     # Octavia
     ENABLED_SERVICES+=,octavia,o-api,o-cw,o-hm,o-hk,o-da
 
diff --git a/hack/ci/cloud-init/worker.yaml.tpl b/hack/ci/cloud-init/worker.yaml.tpl
index 9084b8aad7..0a34b69a22 100644
--- a/hack/ci/cloud-init/worker.yaml.tpl
+++ b/hack/ci/cloud-init/worker.yaml.tpl
@@ -44,6 +44,14 @@
     Q_ML2_PLUGIN_MECHANISM_DRIVERS="ovn,logger"
     Q_AGENT="ovn"
 
+    # WORKAROUND:
+    # 	https://github.com/kubernetes-sigs/cluster-api-provider-openstack/issues/2320
+    # 	OVN built from source using LTS versions. Should be removed once OVS is more stable without the pin.
+    # 	https://opendev.org/openstack/neutron/src/commit/83de306105f9329e24c97c4af6c3886de20e7d70/zuul.d/tempest-multinode.yaml#L603-L604
+    OVN_BUILD_FROM_SOURCE=True
+    OVN_BRANCH=branch-24.03
+    OVS_BRANCH=branch-3.3
+
     # Additional services
     ENABLED_SERVICES+=${OPENSTACK_ADDITIONAL_SERVICES}
     DISABLED_SERVICES+=${OPENSTACK_DISABLED_SERVICES}