diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 072987db4a..af2fb09729 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -265,15 +265,19 @@ function configure_manila {
 
     if is_service_enabled neutron; then
         configure_keystone_authtoken_middleware $MANILA_CONF neutron neutron
+        iniset $MANILA_CONF neutron endpoint_type public
     fi
     if is_service_enabled nova; then
         configure_keystone_authtoken_middleware $MANILA_CONF nova nova
+        iniset $MANILA_CONF nova endpoint_type public
     fi
     if is_service_enabled cinder; then
         configure_keystone_authtoken_middleware $MANILA_CONF cinder cinder
+        iniset $MANILA_CONF cinder endpoint_type public
     fi
     if is_service_enabled glance; then
         configure_keystone_authtoken_middleware $MANILA_CONF glance glance
+        iniset $MANILA_CONF glance endpoint_type public
     fi
     if [ ! $MANILA_ENABLED_BACKENDS ]; then
         # MANILA_ENABLED_BACKENDS is a required option