diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index 2545174..0469d1b 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -1115,7 +1115,7 @@
   <group>
     <id>debian-8</id>
     <name>Debian 8 (jessie) template</name>
-    <default>false</default>
+    <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq>qubes-template-debian-8</packagereq>
@@ -1125,7 +1125,7 @@
   <group>
     <id>whonix</id>
     <name>Whonix</name>
-    <default>false</default>
+    <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq>qubes-template-whonix-gw</packagereq>
@@ -1147,6 +1147,10 @@
      <groupid>qubes</groupid>
      <groupid>kde-desktop-qubes</groupid>
     </grouplist>
+    <optionlist>
+     <groupid default='true'>debian-8</groupid>
+     <groupid default='true'>whonix</groupid>
+    </optionlist>
   </environment>
 
   <environment>
@@ -1165,6 +1169,10 @@
      <groupid>xfce-extra-plugins</groupid>
      <groupid>xfce-media</groupid>
     </grouplist>
+    <optionlist>
+     <groupid default='true'>debian-8</groupid>
+     <groupid default='true'>whonix</groupid>
+    </optionlist>
   </environment>
   <environment>
    <id>qubes-kde-xfce</id>
@@ -1183,6 +1191,10 @@
      <groupid>xfce-media</groupid>
      <groupid>kde-desktop-qubes</groupid>
     </grouplist>
+    <optionlist>
+     <groupid default='true'>debian-8</groupid>
+     <groupid default='true'>whonix</groupid>
+    </optionlist>
   </environment>
   <langpacks>
     <match name="kdelibs" install="kde-l10n-%s"/>