diff --git a/main.pm b/main.pm
index 61db2e57..9d77fec6 100644
--- a/main.pm
+++ b/main.pm
@@ -77,6 +77,11 @@ sub cleanup_needles() {
         unregister_needle_tags("INSTALLER-smallhub");
     }
 
+    # Unregister desktop needles of other desktops when DESKTOP is specified
+    if (get_var('DESKTOP')) {
+        unregister_prefix_tags('DESKTOP', [ get_var('DESKTOP') ])
+    }
+
     # Unregister non-language-appropriate needles. See unregister_except_
     # tags for details; basically all needles with at least one LANGUAGE-
     # tag will be unregistered unless they match the current langauge.
diff --git a/needles/anaconda_install_done-freetype262.json b/needles/anaconda_install_done-freetype262.json
index 9f78f7e9..a912a4b8 100644
--- a/needles/anaconda_install_done-freetype262.json
+++ b/needles/anaconda_install_done-freetype262.json
@@ -2,7 +2,6 @@
   "properties": [],
   "tags": [
     "anaconda_install_done",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
@@ -22,4 +21,4 @@
       "type": "match"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_install_done.json b/needles/anaconda_install_done.json
index e70f5ffb..36222633 100644
--- a/needles/anaconda_install_done.json
+++ b/needles/anaconda_install_done.json
@@ -17,7 +17,6 @@
     ],
     "tags": [
         "anaconda_install_done",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]
diff --git a/needles/anaconda_install_done_french-freetype262.json b/needles/anaconda_install_done_french-freetype262.json
index d0fe28b0..b87ce080 100644
--- a/needles/anaconda_install_done_french-freetype262.json
+++ b/needles/anaconda_install_done_french-freetype262.json
@@ -2,7 +2,6 @@
   "properties": [],
   "tags": [
     "anaconda_install_done",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ],
@@ -22,4 +21,4 @@
       "type": "match"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_install_done_french.json b/needles/anaconda_install_done_french.json
index 872dce38..f36b1f9b 100644
--- a/needles/anaconda_install_done_french.json
+++ b/needles/anaconda_install_done_french.json
@@ -17,8 +17,7 @@
     ],
     "tags": [
         "anaconda_install_done",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french"
     ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_install_root_password.json b/needles/anaconda_install_root_password.json
index da535178..2c09f1ee 100644
--- a/needles/anaconda_install_root_password.json
+++ b/needles/anaconda_install_root_password.json
@@ -10,7 +10,6 @@
     ],
     "tags": [
         "anaconda_install_root_password",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora"
     ]
 }
diff --git a/needles/anaconda_install_user_creation.json b/needles/anaconda_install_user_creation.json
index a7385ce0..86c641fe 100644
--- a/needles/anaconda_install_user_creation.json
+++ b/needles/anaconda_install_user_creation.json
@@ -9,7 +9,6 @@
         }
     ],
     "tags": [
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "anaconda_install_user_creation"
     ]
diff --git a/needles/anaconda_install_user_creation_make_admin-freetype262.json b/needles/anaconda_install_user_creation_make_admin-freetype262.json
index 0f9d6c62..98cea8df 100644
--- a/needles/anaconda_install_user_creation_make_admin-freetype262.json
+++ b/needles/anaconda_install_user_creation_make_admin-freetype262.json
@@ -1,7 +1,6 @@
 {
   "properties": [],
   "tags": [
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english",
     "anaconda_install_user_creation_make_admin"
@@ -15,4 +14,4 @@
       "type": "match"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_install_user_creation_make_admin.json b/needles/anaconda_install_user_creation_make_admin.json
index 30994ac8..f921fafa 100644
--- a/needles/anaconda_install_user_creation_make_admin.json
+++ b/needles/anaconda_install_user_creation_make_admin.json
@@ -9,9 +9,8 @@
         }
     ],
     "tags": [
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english",
         "anaconda_install_user_creation_make_admin"
     ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_install_user_creation_make_admin_french-freetype262.json b/needles/anaconda_install_user_creation_make_admin_french-freetype262.json
index b238288c..7197bf4c 100644
--- a/needles/anaconda_install_user_creation_make_admin_french-freetype262.json
+++ b/needles/anaconda_install_user_creation_make_admin_french-freetype262.json
@@ -10,9 +10,8 @@
   ],
   "properties": [],
   "tags": [
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french",
     "anaconda_install_user_creation_make_admin"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_install_user_creation_make_admin_french.json b/needles/anaconda_install_user_creation_make_admin_french.json
index 448d3317..499858de 100644
--- a/needles/anaconda_install_user_creation_make_admin_french.json
+++ b/needles/anaconda_install_user_creation_make_admin_french.json
@@ -9,7 +9,6 @@
         }
     ],
     "tags": [
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french",
         "anaconda_install_user_creation_make_admin"
diff --git a/needles/anaconda_main_hub_begin_installation-cantarell17.json b/needles/anaconda_main_hub_begin_installation-cantarell17.json
index a18475a9..a605b902 100644
--- a/needles/anaconda_main_hub_begin_installation-cantarell17.json
+++ b/needles/anaconda_main_hub_begin_installation-cantarell17.json
@@ -1,7 +1,6 @@
 {
   "tags": [
     "anaconda_main_hub_begin_installation",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
@@ -15,4 +14,4 @@
     }
   ],
   "properties": []
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_main_hub_begin_installation-freetype262.json b/needles/anaconda_main_hub_begin_installation-freetype262.json
index e2e82b29..2388159e 100644
--- a/needles/anaconda_main_hub_begin_installation-freetype262.json
+++ b/needles/anaconda_main_hub_begin_installation-freetype262.json
@@ -1,7 +1,6 @@
 {
   "tags": [
     "anaconda_main_hub_begin_installation",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
@@ -15,4 +14,4 @@
       "ypos": 703
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_main_hub_begin_installation.json b/needles/anaconda_main_hub_begin_installation.json
index 3aa3a8b6..081723e4 100644
--- a/needles/anaconda_main_hub_begin_installation.json
+++ b/needles/anaconda_main_hub_begin_installation.json
@@ -10,8 +10,7 @@
     ],
     "tags": [
         "anaconda_main_hub_begin_installation",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_main_hub_begin_installation_french-freetype262.json b/needles/anaconda_main_hub_begin_installation_french-freetype262.json
index 53c2c59e..5ce287a2 100644
--- a/needles/anaconda_main_hub_begin_installation_french-freetype262.json
+++ b/needles/anaconda_main_hub_begin_installation_french-freetype262.json
@@ -11,8 +11,7 @@
   "properties": [],
   "tags": [
     "anaconda_main_hub_begin_installation",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_main_hub_begin_installation_french.json b/needles/anaconda_main_hub_begin_installation_french.json
index a1a0d060..e45d6109 100644
--- a/needles/anaconda_main_hub_begin_installation_french.json
+++ b/needles/anaconda_main_hub_begin_installation_french.json
@@ -10,7 +10,6 @@
     ],
     "tags": [
         "anaconda_main_hub_begin_installation",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french"
     ]
diff --git a/needles/anaconda_main_hub_install_destination.json b/needles/anaconda_main_hub_install_destination.json
index ca64e1bf..2de50f0a 100644
--- a/needles/anaconda_main_hub_install_destination.json
+++ b/needles/anaconda_main_hub_install_destination.json
@@ -10,7 +10,6 @@
     ],
     "tags": [
         "anaconda_main_hub_install_destination",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora"
     ]
 }
diff --git a/needles/anaconda_select_install_lang_continue-cantarell17.json b/needles/anaconda_select_install_lang_continue-cantarell17.json
index 6b07b086..0c69a6f2 100644
--- a/needles/anaconda_select_install_lang_continue-cantarell17.json
+++ b/needles/anaconda_select_install_lang_continue-cantarell17.json
@@ -2,7 +2,6 @@
   "properties": [],
   "tags": [
     "anaconda_select_install_lang_continue",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
@@ -15,4 +14,4 @@
       "ypos": 734
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_select_install_lang_continue-freetype262.json b/needles/anaconda_select_install_lang_continue-freetype262.json
index dd6111e3..f6a2856a 100644
--- a/needles/anaconda_select_install_lang_continue-freetype262.json
+++ b/needles/anaconda_select_install_lang_continue-freetype262.json
@@ -1,7 +1,6 @@
 {
   "tags": [
     "anaconda_select_install_lang_continue",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
@@ -15,4 +14,4 @@
       "width": 88
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_select_install_lang_continue.json b/needles/anaconda_select_install_lang_continue.json
index d63e1fb0..49d24522 100644
--- a/needles/anaconda_select_install_lang_continue.json
+++ b/needles/anaconda_select_install_lang_continue.json
@@ -10,8 +10,7 @@
     ],
     "tags": [
         "anaconda_select_install_lang_continue",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_select_install_lang_continue_french-cantarell17.json b/needles/anaconda_select_install_lang_continue_french-cantarell17.json
index 5dceaa8b..06f400c4 100644
--- a/needles/anaconda_select_install_lang_continue_french-cantarell17.json
+++ b/needles/anaconda_select_install_lang_continue_french-cantarell17.json
@@ -9,7 +9,6 @@
   ],
   "tags": [
     "anaconda_select_install_lang_continue",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ],
diff --git a/needles/anaconda_select_install_lang_continue_french.json b/needles/anaconda_select_install_lang_continue_french.json
index 8faf8b67..09af0ecf 100644
--- a/needles/anaconda_select_install_lang_continue_french.json
+++ b/needles/anaconda_select_install_lang_continue_french.json
@@ -10,7 +10,6 @@
     ],
     "tags": [
         "anaconda_select_install_lang_continue",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french"
     ]
diff --git a/needles/anaconda_select_install_lang_english_filtered-cantarell18.json b/needles/anaconda_select_install_lang_english_filtered-cantarell18.json
index 931f9e2f..136293d2 100644
--- a/needles/anaconda_select_install_lang_english_filtered-cantarell18.json
+++ b/needles/anaconda_select_install_lang_english_filtered-cantarell18.json
@@ -18,8 +18,7 @@
   "properties": [],
   "tags": [
     "anaconda_select_install_lang_filtered",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_select_install_lang_english_filtered.json b/needles/anaconda_select_install_lang_english_filtered.json
index 3d6705e3..5e176640 100644
--- a/needles/anaconda_select_install_lang_english_filtered.json
+++ b/needles/anaconda_select_install_lang_english_filtered.json
@@ -17,7 +17,6 @@
     ],
     "tags": [
         "anaconda_select_install_lang_filtered",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]
diff --git a/needles/anaconda_select_install_lang_french_filtered-cantarell17.json b/needles/anaconda_select_install_lang_french_filtered-cantarell17.json
index 1b5088ec..aba28883 100644
--- a/needles/anaconda_select_install_lang_french_filtered-cantarell17.json
+++ b/needles/anaconda_select_install_lang_french_filtered-cantarell17.json
@@ -18,8 +18,7 @@
   ],
   "tags": [
     "anaconda_select_install_lang_filtered",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_select_install_lang_french_filtered-cantarell18.json b/needles/anaconda_select_install_lang_french_filtered-cantarell18.json
index 57593783..c29674c0 100644
--- a/needles/anaconda_select_install_lang_french_filtered-cantarell18.json
+++ b/needles/anaconda_select_install_lang_french_filtered-cantarell18.json
@@ -18,8 +18,7 @@
     "properties": [],
     "tags": [
         "anaconda_select_install_lang_filtered",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french"
     ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_select_install_lang_french_filtered-freetype262.json b/needles/anaconda_select_install_lang_french_filtered-freetype262.json
index 44caaaf5..77c049df 100644
--- a/needles/anaconda_select_install_lang_french_filtered-freetype262.json
+++ b/needles/anaconda_select_install_lang_french_filtered-freetype262.json
@@ -17,9 +17,8 @@
   ],
   "tags": [
     "anaconda_select_install_lang_filtered",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ],
   "properties": []
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_select_install_lang_french_filtered.json b/needles/anaconda_select_install_lang_french_filtered.json
index ebee96e8..0d4abb44 100644
--- a/needles/anaconda_select_install_lang_french_filtered.json
+++ b/needles/anaconda_select_install_lang_french_filtered.json
@@ -17,7 +17,6 @@
   ],
   "tags": [
     "anaconda_select_install_lang_filtered",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ]
diff --git a/needles/anaconda_spoke_done-freetype262.json b/needles/anaconda_spoke_done-freetype262.json
index d80ccca9..4f759d45 100644
--- a/needles/anaconda_spoke_done-freetype262.json
+++ b/needles/anaconda_spoke_done-freetype262.json
@@ -10,9 +10,8 @@
   ],
   "tags": [
     "anaconda_spoke_done",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ],
   "properties": []
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_spoke_done.json b/needles/anaconda_spoke_done.json
index 0c739f4c..2b6e42cd 100644
--- a/needles/anaconda_spoke_done.json
+++ b/needles/anaconda_spoke_done.json
@@ -10,7 +10,6 @@
     ],
     "tags": [
         "anaconda_spoke_done",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]
diff --git a/needles/anaconda_spoke_done_french-freetype262.json b/needles/anaconda_spoke_done_french-freetype262.json
index 2d1a5a6a..8dd73251 100644
--- a/needles/anaconda_spoke_done_french-freetype262.json
+++ b/needles/anaconda_spoke_done_french-freetype262.json
@@ -2,7 +2,6 @@
   "properties": [],
   "tags": [
     "anaconda_spoke_done",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-french"
   ],
@@ -15,4 +14,4 @@
       "type": "match"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_spoke_done_french.json b/needles/anaconda_spoke_done_french.json
index cd050000..ad8271d0 100644
--- a/needles/anaconda_spoke_done_french.json
+++ b/needles/anaconda_spoke_done_french.json
@@ -10,8 +10,7 @@
     ],
     "tags": [
         "anaconda_spoke_done",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-french"
     ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_spoke_done_lighter.json b/needles/anaconda_spoke_done_lighter.json
index 493a196a..501960d3 100644
--- a/needles/anaconda_spoke_done_lighter.json
+++ b/needles/anaconda_spoke_done_lighter.json
@@ -11,8 +11,7 @@
   ],
   "tags": [
     "anaconda_spoke_done",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_spoke_done_olddpi.json b/needles/anaconda_spoke_done_olddpi.json
index ff6fa1bf..ebb81dcb 100644
--- a/needles/anaconda_spoke_done_olddpi.json
+++ b/needles/anaconda_spoke_done_olddpi.json
@@ -10,8 +10,7 @@
     ],
     "tags": [
         "anaconda_spoke_done",
-        "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english"
     ]
-}
\ No newline at end of file
+}
diff --git a/needles/bootloader_uefi.json b/needles/bootloader_uefi.json
index 14a7c1e2..5713b181 100644
--- a/needles/bootloader_uefi.json
+++ b/needles/bootloader_uefi.json
@@ -1,6 +1,5 @@
 {
   "tags": [
-    "ENV-DESKTOP-gnome",
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server_boot",
     "ENV-FLAVOR-workstation_live",
diff --git a/needles/gnome_desktop_clean-cantarell18.json b/needles/gnome_desktop_clean-cantarell18.json
index 5b018902..c71a942b 100644
--- a/needles/gnome_desktop_clean-cantarell18.json
+++ b/needles/gnome_desktop_clean-cantarell18.json
@@ -16,10 +16,10 @@
     }
   ],
   "tags": [
-    "ENV-DESKTOP-gnome",
+    "DESKTOP-gnome",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english",
     "graphical_desktop_clean"
   ],
   "properties": []
-}
\ No newline at end of file
+}
diff --git a/needles/gnome_desktop_clean-freetype262.json b/needles/gnome_desktop_clean-freetype262.json
index 75d091f8..dc906f94 100644
--- a/needles/gnome_desktop_clean-freetype262.json
+++ b/needles/gnome_desktop_clean-freetype262.json
@@ -17,9 +17,9 @@
   ],
   "properties": [],
   "tags": [
-    "ENV-DESKTOP-gnome",
+    "DESKTOP-gnome",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english",
     "graphical_desktop_clean"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome_desktop_clean.json b/needles/gnome_desktop_clean.json
index db62cb95..e2049e2e 100644
--- a/needles/gnome_desktop_clean.json
+++ b/needles/gnome_desktop_clean.json
@@ -1,6 +1,6 @@
 {
   "tags": [
-    "ENV-DESKTOP-gnome",
+    "DESKTOP-gnome",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english",
     "graphical_desktop_clean"
diff --git a/needles/gnome_desktop_runner-cantarell17.json b/needles/gnome_desktop_runner-cantarell17.json
index 86ca5483..81fdc433 100644
--- a/needles/gnome_desktop_runner-cantarell17.json
+++ b/needles/gnome_desktop_runner-cantarell17.json
@@ -10,8 +10,8 @@
     }
   ],
   "tags": [
-    "ENV-DESKTOP-gnome",
+    "DESKTOP-gnome",
     "ENV-FLAVOR-workstation_live",
     "desktop_runner"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome_desktop_runner.json b/needles/gnome_desktop_runner.json
index 512958e1..b96a49b9 100644
--- a/needles/gnome_desktop_runner.json
+++ b/needles/gnome_desktop_runner.json
@@ -10,7 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "ENV-DESKTOP-gnome",
+    "DESKTOP-gnome",
     "ENV-FLAVOR-workstation_live",
     "desktop_runner"
   ]
diff --git a/needles/graphical_login_gdm.json b/needles/graphical_login_gdm.json
index b63376ad..acdad306 100644
--- a/needles/graphical_login_gdm.json
+++ b/needles/graphical_login_gdm.json
@@ -1,6 +1,7 @@
 {
   "tags": [
     "graphical_login",
+    "DESKTOP-gnome",
     "ENV-DISTRI-fedora",
     "LANGUAGE-english",
     "ENV-FLAVOR-develop"
diff --git a/needles/graphical_login_gdm_input.json b/needles/graphical_login_gdm_input.json
index 4060f2d2..59bac059 100644
--- a/needles/graphical_login_gdm_input.json
+++ b/needles/graphical_login_gdm_input.json
@@ -11,8 +11,9 @@
     "properties": [],
     "tags": [
         "graphical_login_input",
+        "DESKTOP-gnome",
         "ENV-DISTRI-fedora",
         "LANGUAGE-english",
         "ENV-FLAVOR-develop"
     ]
-}
\ No newline at end of file
+}
diff --git a/needles/graphical_login_sddm.json b/needles/graphical_login_sddm.json
index dc1137f8..922baf5f 100644
--- a/needles/graphical_login_sddm.json
+++ b/needles/graphical_login_sddm.json
@@ -1,7 +1,7 @@
 {
   "tags": [
     "graphical_login",
-    "ENV-DESKTOP-kde",
+    "DESKTOP-kde",
     "LANGUAGE-english",
     "ENV-FLAVOR-kde_live"
   ],
diff --git a/needles/kde_desktop_runner.json b/needles/kde_desktop_runner.json
index 3dc829ea..6854b6a5 100644
--- a/needles/kde_desktop_runner.json
+++ b/needles/kde_desktop_runner.json
@@ -10,7 +10,7 @@
   ],
   "tags": [
     "desktop_runner",
-    "ENV-DESKTOP-kde",
+    "DESKTOP-kde",
     "ENV-FLAVOR-kde_live"
   ],
   "properties": []
diff --git a/needles/kde_desktop_runner2.json b/needles/kde_desktop_runner2.json
index 3864134f..7d8880d5 100644
--- a/needles/kde_desktop_runner2.json
+++ b/needles/kde_desktop_runner2.json
@@ -10,9 +10,9 @@
     }
   ],
   "tags": [
-    "ENV-DESKTOP-kde",
+    "DESKTOP-kde",
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-kde_live",
     "desktop_runner"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde_live_anaconda_icon.json b/needles/kde_live_anaconda_icon.json
index 216ed40a..d2974330 100644
--- a/needles/kde_live_anaconda_icon.json
+++ b/needles/kde_live_anaconda_icon.json
@@ -1,7 +1,7 @@
 {
   "tags": [
     "live_start_anaconda_icon",
-    "ENV-DESKTOP-kde",
+    "DESKTOP-kde",
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-kde_live"
   ],
diff --git a/needles/workstation_live_initial-20151204-lighter.json b/needles/workstation_live_initial-20151204-lighter.json
index 637a9c53..ac9de431 100644
--- a/needles/workstation_live_initial-20151204-lighter.json
+++ b/needles/workstation_live_initial-20151204-lighter.json
@@ -13,6 +13,6 @@
     "live_initial_anaconda_launcher",
     "live_start_anaconda_icon",
     "ENV-DISTRI-fedora",
-    "ENV-DESKTOP-gnome"
+    "DESKTOP-gnome"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/workstation_live_initial.json b/needles/workstation_live_initial.json
index 7c14908c..adf45cd4 100644
--- a/needles/workstation_live_initial.json
+++ b/needles/workstation_live_initial.json
@@ -3,7 +3,7 @@
     "live_initial_anaconda_launcher",
     "live_start_anaconda_icon",
     "ENV-DISTRI-fedora",
-    "ENV-DESKTOP-gnome"
+    "DESKTOP-gnome"
   ],
   "area": [
     {
diff --git a/templates b/templates
index a9c0d02f..7d10aaf0 100755
--- a/templates
+++ b/templates
@@ -1030,6 +1030,7 @@
                         { key => "BOOTFROM", value => "c" },
                         { key => "HDD_1", value => "disk_f22_desktop_x86_64.img" },
                         { key => "UPGRADE", value => "desktop" },
+                        { key => "DESKTOP", value => "gnome" },
                       ],
                       variables => "",
                     },
@@ -1052,6 +1053,7 @@
                         { key => "BOOTFROM", value => "c" },
                         { key => "HDD_1", value => "disk_f22_desktop_i686.img" },
                         { key => "UPGRADE", value => "desktop" },
+                        { key => "DESKTOP", value => "gnome" },
                       ],
                       variables => "",
                     },