diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 295a88b166..3ba3f97f92 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -461,23 +461,9 @@ function create_default_share_type {
     enabled_backends=(${MANILA_ENABLED_BACKENDS//,/ })
     driver_handles_share_servers=$(iniget $MANILA_CONF ${enabled_backends[0]} driver_handles_share_servers)
 
-    manila \
-        --debug \
-        --os-auth-url $KEYSTONE_AUTH_URI/v2.0 \
-        --os-tenant-name ${OS_PROJECT_NAME:-$OS_TENANT_NAME} \
-        --os-username $OS_USERNAME \
-        --os-password $OS_PASSWORD \
-        --os-region-name $OS_REGION_NAME \
-        type-create $MANILA_DEFAULT_SHARE_TYPE $driver_handles_share_servers
+    manila type-create $MANILA_DEFAULT_SHARE_TYPE $driver_handles_share_servers
     if [[ $MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS ]]; then
-        manila \
-            --debug \
-            --os-auth-url $KEYSTONE_AUTH_URI/v2.0 \
-            --os-tenant-name ${OS_PROJECT_NAME:-$OS_TENANT_NAME} \
-            --os-username $OS_USERNAME \
-            --os-password $OS_PASSWORD \
-            --os-region-name $OS_REGION_NAME \
-            type-key $MANILA_DEFAULT_SHARE_TYPE set $MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS
+        manila type-key $MANILA_DEFAULT_SHARE_TYPE set $MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS
     fi
 }