diff --git a/roles/unifi/meta/main.yml b/roles/unifi/meta/main.yml
index 03d2f55..491f433 100644
--- a/roles/unifi/meta/main.yml
+++ b/roles/unifi/meta/main.yml
@@ -3,8 +3,5 @@
 dependencies:
   - role: mkdir
   - role: repo_mongodb # MongoDB isn't in base repo anymore on EL8
-    when:
-      - ansible_os_family == 'RedHat'
-      - ansible_distribution_major_version is version('8','>=')
     vars:
       - mongo_major_version: 3.4 # Unifi recommends Mong 3.4
diff --git a/roles/unifi/tasks/main.yml b/roles/unifi/tasks/main.yml
index 7425750..f0a1021 100644
--- a/roles/unifi/tasks/main.yml
+++ b/roles/unifi/tasks/main.yml
@@ -11,8 +11,16 @@
   set_fact: unifi_install_mode="none"
   tags: unifi
 
+- name: Remove mongodb from base repo
+  yum: name=mongodb-server state=absent
+  when:
+    - ansible_os_family == 'RedHat'
+    - ansible_distribution_major_version is version('8','<')
+  tags: unifi
+
 - name: Install dependencies
   yum: name={{ unifi_packages }}
+  notify: restart unifi
   tags: unifi
 
 - name: Create a system account to run unifi
@@ -188,17 +196,11 @@
   when: unifi_unit.changed
   tags: unifi
 
-  # Only supported on el8 as el7 provides mongodb-server but no mongodump
-  # It'd be possible to migrate existing el7 server from base mongodb to
-  # the one provided by upstream repo though
 - name: Deploy pre and post backup hooks
   template: src={{ item }}-backup.sh.j2 dest=/etc/backup/{{ item }}.d/unifi mode=755
   loop:
     - pre
     - post
-  when:
-    - ansible_os_family == 'RedHat'
-    - ansible_distribution_major_version is version('8','>=')
   tags: unifi
 
 - name: Start and enable the service
diff --git a/roles/unifi/vars/CentOS-7.yml b/roles/unifi/vars/CentOS-7.yml
index 579134e..a1771e9 100644
--- a/roles/unifi/vars/CentOS-7.yml
+++ b/roles/unifi/vars/CentOS-7.yml
@@ -2,4 +2,5 @@
 
 unifi_packages:
   - java-1.8.0-openjdk-headless
-  - mongodb-server
+  - mongodb-org-server
+  - mongodb-org