diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index d977a46b..fabf1588 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -14,7 +14,8 @@ elif [[ "1ドル" == "stack" && "2ドル" == "post-config" ]]; then
 if is_service_enabled neutron-api || is_service_enabled q-svc; then
 echo_summary "Configuring networking-bgpvpn"
 neutron_service_plugin_class_add bgpvpn
- mkdir -v -p $(dirname $NETWORKING_BGPVPN_CONF) && cp -v $NETWORKING_BGPVPN_DIR/etc/neutron/networking_bgpvpn.conf $NETWORKING_BGPVPN_CONF
+ (cd $NETWORKING_BGPVPN_DIR && ./tools/generate_config_file_samples.sh)
+ mkdir -v -p $(dirname $NETWORKING_BGPVPN_CONF) && cp -v $NETWORKING_BGPVPN_DIR/etc/networking_bgpvpn.conf.sample $NETWORKING_BGPVPN_CONF
 inicomment $NETWORKING_BGPVPN_CONF service_providers service_provider
 iniadd $NETWORKING_BGPVPN_CONF service_providers service_provider $NETWORKING_BGPVPN_DRIVER
 neutron_server_config_add $NETWORKING_BGPVPN_CONF
diff --git a/doc/source/conf.py b/doc/source/conf.py
index cf04094b..41a50218 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -89,7 +89,7 @@ latex_elements = {
 # -- Options for oslo_config.sphinxconfiggen ---------------------------------
 
 _config_generator_config_files = [
- 'networking-bgpvpn.conf',
+ 'networking_bgpvpn.conf',
 ]
 
 def _get_config_generator_config_definition(conf_file):
diff --git a/doc/source/configuration/networking-bgpvpn.rst b/doc/source/configuration/networking-bgpvpn.rst
index 13e5ce38..4cb5b348 100644
--- a/doc/source/configuration/networking-bgpvpn.rst
+++ b/doc/source/configuration/networking-bgpvpn.rst
@@ -1,5 +1,5 @@
 ======================
-networking-bgpvpn.conf
+networking_bgpvpn.conf
 ======================
 
 To use networking-bgpvpn, you need to configure one of valid service providers
@@ -11,4 +11,4 @@ BGPVPN but only one of them can be default.
 * BaGPipe provider: ``service_provider = BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default``
 
 .. show-options::
- :config-file: etc/oslo-config-generator/networking-bgpvpn.conf
+ :config-file: etc/oslo-config-generator/networking_bgpvpn.conf
diff --git a/doc/source/configuration/samples/networking-bgpvpn.rst b/doc/source/configuration/samples/networking-bgpvpn.rst
index ad91cd58..9524b033 100644
--- a/doc/source/configuration/samples/networking-bgpvpn.rst
+++ b/doc/source/configuration/samples/networking-bgpvpn.rst
@@ -1,9 +1,9 @@
 =============================
-Sample networking-bgpvpn.conf
+Sample networking_bgpvpn.conf
 =============================
 
 This sample configuration can also be viewed in `the raw format
 <../../_static/config-samples/networking-bgpvpn.conf.sample>`_.
 
 .. literalinclude::
- ../../_static/config-samples/networking-bgpvpn.conf.sample
+ ../../_static/config-samples/networking_bgpvpn.conf.sample
diff --git a/etc/neutron/networking_bgpvpn.conf b/etc/neutron/networking_bgpvpn.conf
deleted file mode 100644
index 8595d9e1..00000000
--- a/etc/neutron/networking_bgpvpn.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[service_providers]
-# both cannot be default, please choose:
-service_provider=BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default
-#service_provider=BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default
-
-
diff --git a/etc/oslo-config-generator/networking-bgpvpn.conf b/etc/oslo-config-generator/networking_bgpvpn.conf
similarity index 56%
rename from etc/oslo-config-generator/networking-bgpvpn.conf
rename to etc/oslo-config-generator/networking_bgpvpn.conf
index d4978e51..043d8f5b 100644
--- a/etc/oslo-config-generator/networking-bgpvpn.conf
+++ b/etc/oslo-config-generator/networking_bgpvpn.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-output_file = etc/neutron/networking-bgpvpn.conf.sample
+output_file = etc/networking_bgpvpn.conf.sample
 wrap_width = 79
 
 namespace = networking-bgpvpn.service_provider
diff --git a/setup.cfg b/setup.cfg
index 5ebaf742..523ac38e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,9 +26,6 @@ packages =
 networking_bgpvpn
 networking_bgpvpn_heat
 bgpvpn_dashboard
-data_files =
- etc/neutron =
- etc/neutron/networking_bgpvpn.conf
 
 [extras]
 # Dependencies for optional drivers/features.
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/networking-bgpvpn/commit/e09741a68a355b13949b7acefac77fbdbf8219a5.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/networking-bgpvpn/commit/e09741a68a355b13949b7acefac77fbdbf8219a5.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>