diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index b0a7104a..e584de97 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -486,6 +486,19 @@ function create_default_share_type {
     fi
 }
 
+# create_custom_share_types - create share types suitable for both possible
+# driver modes with names "dhss_true" and "dhss_false".
+function create_custom_share_types {
+    manila type-create dhss_true True
+    if [[ $MANILA_DHSS_TRUE_SHARE_TYPE_EXTRA_SPECS ]]; then
+        manila type-key dhss_true set $MANILA_DHSS_TRUE_SHARE_TYPE_EXTRA_SPECS
+    fi
+
+    manila type-create dhss_false False
+    if [[ $MANILA_DHSS_FALSE_SHARE_TYPE_EXTRA_SPECS ]]; then
+        manila type-key dhss_false set $MANILA_DHSS_FALSE_SHARE_TYPE_EXTRA_SPECS
+    fi
+}
 
 # configure_backing_file - Set up backing file for LVM
 function configure_backing_file {
@@ -915,6 +928,9 @@ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
     echo_summary "Creating Manila default share type"
     create_default_share_type
 
+    echo_summary "Creating Manila custom share types"
+    create_custom_share_types
+
     echo_summary "Update Tempest config"
     update_tempest
 
diff --git a/devstack/settings b/devstack/settings
index 6c66d94b..2f0315dc 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -61,8 +61,9 @@ MANILA_DEFAULT_SHARE_TYPE=${MANILA_DEFAULT_SHARE_TYPE:-default}
 # MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='foo=bar quuz=xyzzy'
 # MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='foo=bar quuz=xyzzy fakeprefix:baz=waldo'
 
-
 MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS=${MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS:-''}
+MANILA_DHSS_TRUE_SHARE_TYPE_EXTRA_SPECS=${MANILA_DHSS_TRUE_SHARE_TYPE_EXTRA_SPECS:-$MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS}
+MANILA_DHSS_FALSE_SHARE_TYPE_EXTRA_SPECS=${MANILA_DHSS_FALSE_SHARE_TYPE_EXTRA_SPECS:-$MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS}
 
 # Public facing bits
 MANILA_SERVICE_HOST=${MANILA_SERVICE_HOST:-$SERVICE_HOST}