diff --git a/devstack/lib/heat b/devstack/lib/heat
index f77e4c93fc..2f765503f4 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -140,7 +140,9 @@ function configure_heat {
     fi
 
     iniset $HEAT_CONF database connection `database_connection_url heat`
-    iniset $HEAT_CONF DEFAULT auth_encryption_key $(generate_hex_string 16)
+    # we are using a hardcoded auth_encryption_key as it has to be the same for
+    # multinode deployment.
+    iniset $HEAT_CONF DEFAULT auth_encryption_key "767c3ed056cbaa3b9dfedb8c6f825bf0"
 
     iniset $HEAT_CONF DEFAULT region_name_for_services "$REGION_NAME"
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index e4b34d84af..aa2dcdae36 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -26,10 +26,7 @@ if is_heat_enabled; then
         cleanup_heat
         echo_summary "Configuring heat"
         configure_heat
-
-        if is_service_enabled key; then
-            create_heat_accounts
-        fi
+        create_heat_accounts
 
     elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
         # Initialize heat