diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml
index 10e285325..40647a64a 100644
--- a/roles/mongodb/tasks/install.yml
+++ b/roles/mongodb/tasks/install.yml
@@ -48,7 +48,7 @@
       shell: /usr/sbin/nologin
 
   # end block
-  when: is_raspbian and not (ansible_architecture == "aarch64")
+  when: not (ansible_architecture == "amd64") or not (ansible_architecture == "aarch64")
 
 # OLD WAY / MUCH SLOWER: had put unnec duplicate copies in /opt/iiab/downloads/mongodb-3.0.1x
 #
@@ -92,19 +92,26 @@
   - name: Add mongodb.org signing key
     shell: wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add -
 
-  - name: Add mongodb repo for Debian amd64
+  - name: Add mongodb repo for Debian 10 amd64
     apt_repository:
       repo: deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main
       state: present
       filename: mongodb-org
     when: is_debian_10 and (ansible_architecture == "amd64")
 
-  - name: Add mongodb repo for Ubuntu all or Debian arm64
+  - name: Add mongodb repo for Ubuntu 18 all or Raspbian-arm64
+    apt_repository:
+      repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse
+      state: present
+      filename: mongodb-org
+    when: (ansible_architecture == "aarch64" and is_raspbian) or is_ubuntu_18
+
+  - name: Add mongodb repo for Ubuntu 20
     apt_repository:
       repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse
       state: present
       filename: mongodb-org
-    when: (ansible_architecture == "aarch64")
+    when: is_ubuntu_20 and (ansible_architecture == "aarch64" or ansible_architecture == "amd64")
 
   - name: "Install packages: mongodb-org, mongodb-org-server"
     package: