diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml
index f4bdae83b..b7dd56855 100644
--- a/roles/7-edu-apps/tasks/main.yml
+++ b/roles/7-edu-apps/tasks/main.yml
@@ -21,7 +21,7 @@
 - name: MOODLE
   include_role:
     name: moodle
-  when: moodle_install    # and not is_ubuntu_2204 and not is_ubuntu_2210    # TEMPORARY
+  when: moodle_install and not is_ubuntu_2204 and not is_ubuntu_2210    # TEMPORARY
 
 - name: OSM-VECTOR-MAPS
   include_role:
@@ -43,7 +43,7 @@
 - name: SUGARIZER
   include_role:
     name: sugarizer
-  when: sugarizer_install    # and not is_ubuntu_2204 and not is_ubuntu_2210    # TEMPORARY
+  when: sugarizer_install and not is_ubuntu_2204 and not is_ubuntu_2210    # TEMPORARY
 
 - name: Recording STAGE 7 HAS COMPLETED ========================
   lineinfile:
diff --git a/vars/linuxmint-21.yml b/vars/linuxmint-21.yml
index 5a1e79131..a6403ed91 100644
--- a/vars/linuxmint-21.yml
+++ b/vars/linuxmint-21.yml
@@ -2,7 +2,7 @@
 # /opt/iiab/iiab/vars/default_vars.yml -- these 'True' lines override that:
 is_debuntu: True
 is_ubuntu: True    # Opposite of is_debian for now
-is_ubuntu_22: True
+is_ubuntu_2204: True
 is_linuxmint: True
 is_linuxmint_21: True