diff --git a/devstack/override-defaults b/devstack/override-defaults
index 4168b188..fac7d4ae 100644
--- a/devstack/override-defaults
+++ b/devstack/override-defaults
@@ -1,5 +1,10 @@
 # Plug-in overrides
 
+disable_service s-account
+disable_service s-container
+disable_service s-object
+disable_service s-proxy
+
 ENABLE_CEPH_CINDER=$(trueorfalse True ENABLE_CEPH_CINDER)
 ENABLE_CEPH_C_BAK=$(trueorfalse True ENABLE_CEPH_C_BAK)
 ENABLE_CEPH_GLANCE=$(trueorfalse True ENABLE_CEPH_GLANCE)
@@ -7,7 +12,7 @@ ENABLE_CEPH_NOVA=$(trueorfalse True ENABLE_CEPH_NOVA)
 
 # RGW is not enabled by default as its not used in upstream CI, yet!
 # Local devstack setup can enable it in localrc, if needed
-ENABLE_CEPH_RGW=$(trueorfalse False ENABLE_CEPH_RGW)
+ENABLE_CEPH_RGW=$(trueorfalse True ENABLE_CEPH_RGW)
 
 if [[ $ENABLE_CEPH_CINDER == "True" ]]; then
     CINDER_DRIVER=ceph
diff --git a/devstack/settings b/devstack/settings
index 64c86c04..4854b8db 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -14,6 +14,11 @@ CEPH_PLUGIN_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 TEMPEST_STORAGE_PROTOCOL=ceph
 CEPH_LOOPBACK_DISK_SIZE=8G
 
+disable_service s-account
+disable_service s-container
+disable_service s-object
+disable_service s-proxy
+
 # Source plugin's lib/ceph
 
 source $CEPH_PLUGIN_DIR/lib/ceph