diff --git a/createhdds.py b/createhdds.py
index 86b8189..b941a23 100755
--- a/createhdds.py
+++ b/createhdds.py
@@ -270,6 +270,10 @@ class VirtInstallImage(object):
             fedoradir = 'fedora-secondary'
 
         variant = self.variant
+        # From F31 onwards, Workstation tree is not installable and we
+        # build Workstation images out of Everything
+        if variant == 'Workstation' and self.release.isdigit() and int(self.release) > 30:
+            variant = 'Everything'
 
         try:
             # this is almost complex enough to need fedfind but not