diff --git a/firstboot/modules/qubes_setup.py b/firstboot/modules/qubes_setup.py
index b61b6eb..8746828 100644
--- a/firstboot/modules/qubes_setup.py
+++ b/firstboot/modules/qubes_setup.py
@@ -76,6 +76,8 @@ class moduleClass(Module):
             if testing:
                 return RESULT_SUCCESS
 
+            self.set_default_template()
+
             if self.radio_dontdoanything.get_active():
                 return RESULT_SUCCESS
 
@@ -111,6 +113,9 @@ class moduleClass(Module):
         self.stage = stage
         self.progress.set_text(stage)
 
+    def set_default_template(self):
+        subprocess.call(['/usr/bin/qubes-prefs', '--set', 'default-template', 'fedora-21'])
+
     def configure_template(self):
         self.show_stage(_("Configuring default TemplateVM"))
         self.run_in_thread(self.do_configure_template)