diff --git a/_service b/_service
index bd3391c..c91a953 100644
--- a/_service
+++ b/_service
@@ -1,8 +1,8 @@
 <services>
   <service mode="disabled" name="renderspec">
-    <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/python-heatclient/python-heatclient.spec.j2</param>
+    <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/queens/openstack/python-heatclient/python-heatclient.spec.j2</param>
     <param name="output-name">python-heatclient.spec</param>
-    <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/requirements.txt</param>
+    <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/queens/requirements.txt</param>
     <param name="changelog-email">cloud-devel@suse.de</param>
     <param name="changelog-provider">gh,openstack,python-heatclient</param>
   </service>
diff --git a/python-heatclient.changes b/python-heatclient.changes
index 6613a44..78850f3 100644
--- a/python-heatclient.changes
+++ b/python-heatclient.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb 23 13:03:14 UTC 2018 - tbechtold@suse.com
+
+- Switch to stable/queens spec template
+
 -------------------------------------------------------------------
 Mon Feb 12 09:56:03 UTC 2018 - cloud-devel@suse.de
 
diff --git a/python-heatclient.spec b/python-heatclient.spec
index 16e44e0..a74ca0d 100644
--- a/python-heatclient.spec
+++ b/python-heatclient.spec
@@ -86,7 +86,7 @@ the OpenStack Heat API.
 Summary:        Documentation for OpenStack Heat API Client
 Group:          Documentation/HTML
 BuildRequires:  python-Sphinx
-BuildRequires:  python-openstackdocstheme >= 1.17.0
+BuildRequires:  python-openstackdocstheme >= 1.18.1
 
 %description -n python-heatclient-doc
 This is a client for the OpenStack Heat API. There's a Python API (the