diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
index bde2e3077..4a8283658 100644
--- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
+++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -7172,6 +7172,10 @@ spec:
                     type: boolean
                   template:
                     properties:
+                      apiTimeout:
+                        default: 60
+                        minimum: 10
+                        type: integer
                       customServiceConfig:
                         default: '# add your customization here'
                         type: string
diff --git a/apis/core/v1beta1/openstackcontrolplane_webhook.go b/apis/core/v1beta1/openstackcontrolplane_webhook.go
index 046b2d0a0..8b4edaf23 100644
--- a/apis/core/v1beta1/openstackcontrolplane_webhook.go
+++ b/apis/core/v1beta1/openstackcontrolplane_webhook.go
@@ -479,6 +479,8 @@ func (r *OpenStackControlPlane) DefaultServices() {
 
 	// Manila
 	r.Spec.Manila.Template.Default()
+	initializeOverrideSpec(&r.Spec.Manila.APIOverride.Route, true)
+	r.Spec.Manila.Template.SetDefaultRouteAnnotations(r.Spec.Manila.APIOverride.Route.Annotations)
 
 	// Memcached
 	for key, template := range r.Spec.Memcached.Templates {
diff --git a/apis/go.mod b/apis/go.mod
index b2982d27d..e7d164c3e 100644
--- a/apis/go.mod
+++ b/apis/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240605055850-8ee0ece70906
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240606071226-62abb00585ce
 	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240603143707-f5c5fe030fdd
-	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240602180119-bb1bd220b0ff
+	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240607065123-84eee5519cb5
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240604125710-954ab886bb52
 	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240603080833-afe415667bba
 	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240604091821-40e0e3428930
diff --git a/apis/go.sum b/apis/go.sum
index 906df4d7d..b0dd8f25c 100644
--- a/apis/go.sum
+++ b/apis/go.sum
@@ -97,8 +97,8 @@ github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.2024060
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240603143707-f5c5fe030fdd/go.mod h1:TMUocGLbCA0t/wR418+Y+KpyASgk4Ng/EwZu41rpGck=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240603143707-f5c5fe030fdd h1:+5pEzyWRQEb6ijtXgqzTkJFY8sU324Iz+TJ4q1GxtIs=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240603143707-f5c5fe030fdd/go.mod h1:HnATO+h6spGXATZ8fdOc+CJ47BiTV3ML1ZtGZa6yj3I=
-github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240602180119-bb1bd220b0ff h1:tRMcOm8K2tG7EY5UECwzwbIKSyo/jC4jrC44amBte1U=
-github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240602180119-bb1bd220b0ff/go.mod h1:47/hHuGGXHZx7eWJpsPzwW9tem0Ghod85PSnlBasT0Y=
+github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240607065123-84eee5519cb5 h1:ai9dfLRdVAQygCrPBNvRnjiQN+DLfg+IsO+gC5Pt6pk=
+github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240607065123-84eee5519cb5/go.mod h1:47/hHuGGXHZx7eWJpsPzwW9tem0Ghod85PSnlBasT0Y=
 github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240604125710-954ab886bb52 h1:kLUdkStYxfle2pufyluxrRZViAc+yZ7MTKGu4PEYaHA=
 github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240604125710-954ab886bb52/go.mod h1:MyDbpztq0ZB0X5sIR+SrXTmfKqBswztAz2AmdKOiHV4=
 github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240603080833-afe415667bba h1:Q9fQSjOpUwMnFenEU6eGMcZXaRw6VVQSQlU0llfNm74=
diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
index bde2e3077..4a8283658 100644
--- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
+++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -7172,6 +7172,10 @@ spec:
                     type: boolean
                   template:
                     properties:
+                      apiTimeout:
+                        default: 60
+                        minimum: 10
+                        type: integer
                       customServiceConfig:
                         default: '# add your customization here'
                         type: string
diff --git a/go.mod b/go.mod
index 4d984c14c..651ff99b4 100644
--- a/go.mod
+++ b/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240603143707-f5c5fe030fdd
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240606071226-62abb00585ce
 	github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240603143707-f5c5fe030fdd
-	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240602180119-bb1bd220b0ff
+	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240607065123-84eee5519cb5
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240604125710-954ab886bb52
 	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240603080833-afe415667bba
 	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240604091821-40e0e3428930
diff --git a/go.sum b/go.sum
index 6bfd1efea..0dd1a2e4c 100644
--- a/go.sum
+++ b/go.sum
@@ -126,8 +126,8 @@ github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.202406031
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240603143707-f5c5fe030fdd/go.mod h1:HnATO+h6spGXATZ8fdOc+CJ47BiTV3ML1ZtGZa6yj3I=
 github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240603143707-f5c5fe030fdd h1:ft+A4J0/arwsD3FQeDTI8zl++XFb6ybm3WY5orjVZjw=
 github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240603143707-f5c5fe030fdd/go.mod h1:0h76CxD9g0z2Hk7fGFOZcjnzT1tQQ/yRNv3OXng+S/A=
-github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240602180119-bb1bd220b0ff h1:tRMcOm8K2tG7EY5UECwzwbIKSyo/jC4jrC44amBte1U=
-github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240602180119-bb1bd220b0ff/go.mod h1:47/hHuGGXHZx7eWJpsPzwW9tem0Ghod85PSnlBasT0Y=
+github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240607065123-84eee5519cb5 h1:ai9dfLRdVAQygCrPBNvRnjiQN+DLfg+IsO+gC5Pt6pk=
+github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240607065123-84eee5519cb5/go.mod h1:47/hHuGGXHZx7eWJpsPzwW9tem0Ghod85PSnlBasT0Y=
 github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240604125710-954ab886bb52 h1:kLUdkStYxfle2pufyluxrRZViAc+yZ7MTKGu4PEYaHA=
 github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240604125710-954ab886bb52/go.mod h1:MyDbpztq0ZB0X5sIR+SrXTmfKqBswztAz2AmdKOiHV4=
 github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240603080833-afe415667bba h1:Q9fQSjOpUwMnFenEU6eGMcZXaRw6VVQSQlU0llfNm74=
diff --git a/tests/functional/base_test.go b/tests/functional/base_test.go
index 48956be5f..e52ef7901 100644
--- a/tests/functional/base_test.go
+++ b/tests/functional/base_test.go
@@ -355,6 +355,9 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
 	glanceTemplate := map[string]interface{}{
 		"apiTimeout": 60,
 	}
+	manilaTemplate := map[string]interface{}{
+		"apiTimeout": 60,
+	}
 
 	return map[string]interface{}{
 		"secret":       "osp-secret",
@@ -382,6 +385,10 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
 			"enabled":  false,
 			"template": glanceTemplate,
 		},
+		"manila": map[string]interface{}{
+			"enabled":  false,
+			"template": manilaTemplate,
+		},
 		"horizon": map[string]interface{}{
 			"enabled": true,
 		},
diff --git a/tests/functional/openstackoperator_controller_test.go b/tests/functional/openstackoperator_controller_test.go
index 56eef4d37..cc0c66535 100644
--- a/tests/functional/openstackoperator_controller_test.go
+++ b/tests/functional/openstackoperator_controller_test.go
@@ -564,6 +564,8 @@ var _ = Describe("OpenStackOperator controller", func() {
 				Expect(OSCtlplane.Spec.Glance.APIOverride[name].Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "60s"))
 				Expect(OSCtlplane.Spec.Glance.APIOverride[name].Route.Annotations).Should(HaveKeyWithValue("api.glance.openstack.org/timeout", "60s"))
 			}
+			Expect(OSCtlplane.Spec.Manila.APIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "60s"))
+			Expect(OSCtlplane.Spec.Manila.APIOverride.Route.Annotations).Should(HaveKeyWithValue("api.manila.openstack.org/timeout", "60s"))
 		})
 
 		It("should create selfsigned issuer and public+internal CA and issuer", func() {