diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml
index a31396a54..95d7a6a79 100644
--- a/roles/mongodb/tasks/install.yml
+++ b/roles/mongodb/tasks/install.yml
@@ -59,7 +59,7 @@
 
 
   # end block
-  when: not (ansible_architecture == "x86_64" or ansible_architecture == "aarch64")
+  when: not (ansible_userspace_architecture == "x86_64" or ansible_userspace_architecture == "aarch64")
 # 32 bit OS's get caught above should handle aarch32 including 32-bit ubuntu
 # from https://ubuntu.com/download/raspberry-pi. 20.4-32bit might fail untested
 # 32bit intel might puke as this was orginally deployed for raspbian. Haven't
@@ -76,22 +76,22 @@
       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 == "x86_64")
+    when: is_debian_10 and (ansible_userspace_architecture == "x86_64")
 
   # Debian 10 aarch64 might work below but is blocked in main.yml
-  - name: Add mongodb repo for Ubuntu 18 64bit or Raspbian-aarch64
+  - name: Add mongodb repo for RaspOS-aarch64
     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_10) or is_ubuntu_18
+    when: (ansible_userspace_architecture == "aarch64" and is_raspbian_10)
 
-  - name: Add mongodb repo for Ubuntu 20 64bit
+  - name: Add mongodb repo for Ubuntu 64bit only
     apt_repository:
-      repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse
+      repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.4 multiverse
       state: present
       filename: mongodb-org
-    when: is_ubuntu_20
+    when: is_ubuntu
 
   - name: "Install packages: mongodb-org, mongodb-org-server"
     package:
@@ -108,7 +108,7 @@
       line: '  port: 27018'
 
   # end block
-  when: (ansible_architecture == "aarch64") or (ansible_architecture == "x86_64")
+  when: (ansible_userspace_architecture == "aarch64") or (ansible_userspace_architecture == "x86_64")
 
 
 # 2. CONFIGURE MongoDB FOR IIAB
diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml
index 5b9f529e4..fb73fe0dd 100644
--- a/roles/osm-vector-maps/tasks/install.yml
+++ b/roles/osm-vector-maps/tasks/install.yml
@@ -94,13 +94,11 @@
       src: '{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles'
       dest: '{{ vector_map_path }}/viewer/tiles/planet_z0-z6_2019.mbtiles'
       state: link
-  when: osm_vector_maps_enabled | bool
 
 - name: Copy the map abbreviated satellite images
   get_url:
     url: "{{ map_catalog_url }}/satellite_z0-z6_v3.mbtiles"
     dest: '{{ vector_map_path }}/viewer/tiles/satellite_z0-z6_v3.mbtiles'
-  when: osm_vector_maps_enabled | bool
 
 - name: Fetch the javascript bundle for map installer
   get_url:
diff --git a/roles/postgresql/tasks/install.yml b/roles/postgresql/tasks/install.yml
index eb77dcac9..535bb1794 100644
--- a/roles/postgresql/tasks/install.yml
+++ b/roles/postgresql/tasks/install.yml
@@ -80,6 +80,21 @@
     state: stopped
     enabled: no
 
+- name: Disable & Stop stock 'postgresql@11-main.service' systemd service - debian-10
+  systemd:
+    name: postgresql@11-main.service
+    state: stopped
+    enabled: no
+#  when: is_debian_10
+  when: is_debian_10 and not is_raspbian
+
+- name: Disable & Stop stock 'postgresql@' systemd service - debian-10
+  systemd:
+    name: postgresql@
+    enabled: no
+#  when: is_debian_10
+  when: is_debian_10 and not is_raspbian
+
 
 # RECORD PostgreSQL AS INSTALLED