diff --git a/templates/manila/config/00-config.conf b/templates/manila/config/00-config.conf
index c8c01abd..149bcf18 100644
--- a/templates/manila/config/00-config.conf
+++ b/templates/manila/config/00-config.conf
@@ -5,6 +5,8 @@ enabled_share_backends = alpha
 host=hostgroup
 storage_availability_zone=nova
 default_share_type=default
+# Keep share status updates out of the ensure path for RHOSO 18.
+update_shares_status_on_ensure = False
 rootwrap_config=/etc/manila/rootwrap.conf
 auth_strategy=keystone
 control_exchange=openstack
diff --git a/test/functional/manila_controller_test.go b/test/functional/manila_controller_test.go
index aa5e7fdf..008f7808 100644
--- a/test/functional/manila_controller_test.go
+++ b/test/functional/manila_controller_test.go
@@ -271,6 +271,8 @@ var _ = Describe("Manila controller", func() {
 
 			secretDataMap := th.GetSecret(manilaTest.ManilaConfigSecret)
 			Expect(secretDataMap).ShouldNot(BeNil())
+			conf := string(secretDataMap.Data["00-config.conf"])
+			Expect(conf).Should(ContainSubstring("update_shares_status_on_ensure = False"))
 			myCnf := string(secretDataMap.Data["my.cnf"])
 			Expect(myCnf).To(
 				ContainSubstring("[client]\nssl=0"))