diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml
index 748493c68..4403bed93 100644
--- a/roles/mongodb/tasks/main.yml
+++ b/roles/mongodb/tasks/main.yml
@@ -34,19 +34,19 @@
     var: is_debian
 - debug:
     var: is_raspbian
-
-# # might be able to lift this once we know using bionic would work
-# - name: EXIT 'mongodb' ROLE & CONTINUE, IF 'is_debian_10 and aarch64 and not is_raspbian' i.e. TRUE DEBIAN with arch64
-#   fail:    # FORCE IT RED THIS ONCE!
-#     msg: ATTEMPTED MongoDB INSTALLATION WITH (TRUE) DEBIAN aarch64, which is not supported upstream.  Nevertheless IIAB will continue (consider this a warning!)
-#   when: (ansible_architecture == "aarch64") and is_debian_10 and not is_raspbian
-#   ignore_errors: yes
-
-# ELSE...
-
+- debug:
+    var: dpkg_arch
+- debug:
+    var: mongodb_version
 
 - block:
 
+  - name: EXIT 'mongodb' ROLE & CONTINUE, when 32bit RasPiOS is in use or 'unsupported'
+    fail:    # FORCE IT RED THIS ONCE!
+      msg: ATTEMPTED MongoDB INSTALLATION WITH 32bit RasPiOS, which is not supported upstream.  Nevertheless IIAB will continue (consider this a warning!)
+    when: (mongodb_version == "unsupported") or (dpkg_arch == "armhf")
+
+# ELSE...
   - name: Install MongoDB if 'mongodb_installed' not defined, e.g. in {{ iiab_state_file }}    # /etc/iiab/iiab_state.yml
     include_tasks: install.yml
     when: mongodb_installed is undefined