diff --git a/devstack/lib/freezer b/devstack/lib/freezer
index 5eaefe47..2df97e15 100644
--- a/devstack/lib/freezer
+++ b/devstack/lib/freezer
@@ -66,7 +66,7 @@ function configure_freezer_scheduler {
 
     [ ! -d $FREEZER_CONF_DIR ] && sudo mkdir -m 755 -p $FREEZER_CONF_DIR
     sudo chown $USER $FREEZER_CONF_DIR
-
+    sudo cp -p  $FREEZER_DIR/etc/scheduler.conf.sample $FREEZER_CONF_FILE
     [ ! -d $FREEZER_LOG_DIR ] &&  sudo mkdir -m 755 -p $FREEZER_LOG_DIR
     sudo chown $USER $FREEZER_LOG_DIR
 
diff --git a/devstack/settings b/devstack/settings
index 18fb1ce4..232ea5ae 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -17,8 +17,8 @@
 
 # Set up default directories
 FREEZER_DIR=$DEST/freezer
-FREEZER_FILES=${FREEZER_API_DIR}/devstack/files
-FREEZER_CONF_DIR=${FREEZER_CONF_DIR:-/etc}
+FREEZER_CONF_DIR=${FREEZER_CONF_DIR:-/etc/freezer}
+FREEZER_CONF_FILE=$FREEZER_CONF_DIR/scheduler.conf
 FREEZER_LOG_DIR=$DEST/logs
 
 # Freezer API repository