diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a3073f22a..4ded72571 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -57,14 +57,8 @@ function neutron_fwaas_configure_common {
 }
 
 function neutron_fwaas_configure_driver {
-    # Uses oslo config generator to generate FWaaS sample configuration files
-    (cd $NEUTRON_FWAAS_DIR && exec ./tools/generate_config_file_samples.sh)
-
-    cp $NEUTRON_FWAAS_DIR/etc/$FWAAS_DRIVER_CONF_FILENAME.sample $FWAAS_CONF_FILE
-
-    iniset_multiline $FWAAS_CONF_FILE fwaas enabled True
-    iniset_multiline $FWAAS_CONF_FILE fwaas driver $FWAAS_DRIVER
-    #iniset $NEUTRON_CONF DEFAULT service_plugins $Q_SERVICE_PLUGIN_CLASSES
+    iniset_multiline $Q_L3_CONF_FILE fwaas enabled True
+    iniset_multiline $Q_L3_CONF_FILE fwaas driver $FWAAS_DRIVER
 }
 
 # check for service enabled
diff --git a/devstack/settings b/devstack/settings
index f054394f4..26378e47a 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,4 +1,2 @@
 FWAAS_DRIVER=${FWAAS_DRIVER:-iptables}
 FWAAS_PLUGIN=${FWAAS_PLUGIN:-firewall}
-FWAAS_DRIVER_CONF_FILENAME=${FWAAS_DRIVER_CONF_FILENAME:-fwaas_driver.ini}
-FWAAS_CONF_FILE=${Q_FWAAS_CONF_FILE:-$NEUTRON_CONF_DIR/$FWAAS_DRIVER_CONF_FILENAME}