diff --git a/debian/changelog b/debian/changelog
index 956264e05..c8296aa2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ heat (1:7.0.0~rc1-2) UNRELEASED; urgency=medium
   [ Thomas Goirand ]
   * Build-Depends on openstack-pkg-tools >= 53~.
   * Fixed oslotest EPOCH.
+  * Fixed config gneration namespaces.
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 28 Sep 2016 09:42:21 +0200
 
diff --git a/debian/rules b/debian/rules
index 74edafeb2..11e84e308 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ override_dh_install:
 		--namespace heat.common.config \
                 --namespace heat.common.context \
 		--namespace heat.common.crypt \
-		--namespace heat.common.heat_keystoneclient \
+		--namespace heat.engine.clients.keystone.heat_keystoneclient \
 		--namespace heat.common.wsgi \
 		--namespace heat.engine.clients \
 		--namespace heat.engine.notification \
@@ -56,6 +56,7 @@ override_dh_install:
                 --namespace oslo.service.sslutil \
 		--wrap-width 140 \
 		--output-file $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf
+
 	sed -i 's|^[# \t]*connection[\t #]*=.*|connection=sqlite:////var/lib/heat/heatdb|' $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf
 	sed -i 's|^[# \t]*auth_protocol[\t #]*=.*|auth_protocol = http|' $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf