diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index 39a0b76..db39b8c 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -1161,7 +1161,7 @@
qubes-artwork
qubes-manager
qubes-mgmt-salt-dom0
- qubes-template-fedora-23
+ qubes-template-fedora-26
qubes-gpg-split-dom0
qubes-img-converter-dom0
qubes-pdf-converter-dom0
@@ -1171,12 +1171,12 @@
- debian-8
- Debian 8 (jessie) template
+ debian
+ Debian 9 (stretch) template
true
true
- qubes-template-debian-8
+ qubes-template-debian-9
@@ -1208,7 +1208,7 @@
xfce-media
- debian-8
+ debian
whonix
diff --git a/conf/qubes-kickstart.cfg b/conf/qubes-kickstart.cfg
index 8ea2b3b..c8dae37 100644
--- a/conf/qubes-kickstart.cfg
+++ b/conf/qubes-kickstart.cfg
@@ -21,6 +21,6 @@ repo --name=dom0-updates --baseurl=file:///tmp/qubes-installer/yum/dom0-updates/
@hardware-support
@qubes
@anaconda-tools
-@debian-8
+@debian
@whonix
%end
diff --git a/qubes-anaconda-addon/firstboot-qubes-text b/qubes-anaconda-addon/firstboot-qubes-text
index 676a6dd..2618d84 100755
--- a/qubes-anaconda-addon/firstboot-qubes-text
+++ b/qubes-anaconda-addon/firstboot-qubes-text
@@ -104,7 +104,7 @@ if [ "$vms_template" == "yes" ]; then
qvm-shutdown --wait $template
done
- qubes-prefs --set default-template 'fedora-23'
+ qubes-prefs --set default-template 'fedora-26'
fi
if [ "$vms_service" == "yes" -o "$vms_app" == "yes" ]; then
diff --git a/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py b/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
index 1f2ee7b..3608240 100644
--- a/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
+++ b/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
@@ -227,7 +227,7 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
self.qubes_user = None
self.qubes_gid = None
- self.default_template = 'fedora-23'
+ self.default_template = 'fedora-26'
self.set_stage("Start-up")
self.done = False