diff --git a/etc/oslo-config-generator/barbican.conf b/etc/oslo-config-generator/barbican.conf
index 466924f6..c1fb9188 100644
--- a/etc/oslo-config-generator/barbican.conf
+++ b/etc/oslo-config-generator/barbican.conf
@@ -1,6 +1,5 @@
 [DEFAULT]
 output_file = etc/barbican/barbican.conf.sample
-namespace = barbican
 namespace = barbican.certificate.plugin
 namespace = barbican.certificate.plugin.snakeoil
 namespace = barbican.common.config
diff --git a/setup.cfg b/setup.cfg
index d0f81c52..1c2e7707 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -61,7 +61,7 @@ oslo.config.opts =
     barbican.plugin.secret_store = barbican.plugin.interface.secret_store:list_opts
     barbican.plugin.crypto = barbican.plugin.crypto.manager:list_opts
     barbican.plugin.crypto.simple = barbican.plugin.crypto.simple_crypto:list_opts
-    barbican.plugin.dogtag_config_opts = barbican.plugin.dogtag:list_opts
+    barbican.plugin.dogtag = barbican.plugin.dogtag_config_opts:list_opts
     barbican.plugin.crypto.p11 = barbican.plugin.crypto.p11_crypto:list_opts
     barbican.plugin.secret_store.kmip = barbican.plugin.kmip_secret_store:list_opts
     barbican.certificate.plugin = barbican.plugin.interface.certificate_manager:list_opts