diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index 62f426b..80563b2 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -1163,6 +1163,26 @@
     </packagelist>
   </group>
 
+  <group>
+    <id>debian-7</id>
+    <name>Debian 7 (wheezy) template</name>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq>qubes-template-debian-7</packagereq>
+    </packagelist>
+  </group>
+
+  <group>
+    <id>debian-8</id>
+    <name>Debian 8 (jessie) template</name>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq>qubes-template-debian-8</packagereq>
+    </packagelist>
+  </group>
+
   <environment>
    <id>qubes-kde</id>
    <display_order>2</display_order>
diff --git a/conf/qubes-kickstart.cfg b/conf/qubes-kickstart.cfg
index 43fb870..9091539 100644
--- a/conf/qubes-kickstart.cfg
+++ b/conf/qubes-kickstart.cfg
@@ -23,4 +23,6 @@ repo --name=dom0-updates --baseurl=file:///tmp/qubes-installer/yum/dom0-updates/
 @qubes
 @anaconda-tools
 @qubes-dom0-debug
+@debian-7
+@debian-8
 %end