diff --git a/files/keystone.conf b/files/keystone.conf
index 0649e90725..1f5c445395 100644
--- a/files/keystone.conf
+++ b/files/keystone.conf
@@ -16,7 +16,7 @@ driver = keystone.backends.sql.SqlIdentity
 
 [catalog]
 driver = keystone.backends.templated.TemplatedCatalog
-template_file = ./etc/default_catalog.templates
+template_file = %KEYSTONE_DIR%/etc/default_catalog.templates
 
 [token]
 driver = keystone.backends.kvs.KvsToken
diff --git a/stack.sh b/stack.sh
index 6ce86706f7..a342a8b5e0 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1354,6 +1354,7 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
     sudo sed -e "s,%SQL_CONN%,$BASE_SQL_CONN/keystone,g" -i $KEYSTONE_CONF
     sudo sed -e "s,%DEST%,$DEST,g" -i $KEYSTONE_CONF
     sudo sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $KEYSTONE_CONF
+    sudo sed -e "s,%KEYSTONE_DIR%,$KEYSTONE_DIR,g" -i $KEYSTONE_CONF
 
     KEYSTONE_CATALOG=$KEYSTONE_DIR/etc/default_catalog.templates
     cp $FILES/default_catalog.templates $KEYSTONE_CATALOG