diff --git a/powerflex-ansible/roles/powerflex-facts/tasks/facts.yaml b/powerflex-ansible/roles/powerflex-facts/tasks/facts.yaml
index 1fc1587..8be5045 100644
--- a/powerflex-ansible/roles/powerflex-facts/tasks/facts.yaml
+++ b/powerflex-ansible/roles/powerflex-facts/tasks/facts.yaml
@@ -53,3 +53,7 @@
 - name: Set the spare policy based upon SDSs count
   set_fact:
     spare_policy_pct: "{{ ((100 / sds_count | int) | round) | int }}"
+
+- name: Check installed RPMS
+  package_facts:
+    manager: auto
diff --git a/powerflex-ansible/site.yaml b/powerflex-ansible/site.yaml
index 5e43a5a..313680c 100644
--- a/powerflex-ansible/site.yaml
+++ b/powerflex-ansible/site.yaml
@@ -29,7 +29,7 @@
   gather_facts: no
   become: true
   roles:
-   - powerflex-mdm
+   - { role: "powerflex-mdm", when: "'EMC-ScaleIO-mdm' not in ansible_facts.packages" }
   tags: powerflex-mdm
 
 - hosts: tbs
@@ -37,36 +37,37 @@
   gather_facts: no
   become: true
   roles:
-   - powerflex-tb
+   - { role: "powerflex-tb", when: "'EMC-ScaleIO-mdm' not in ansible_facts.packages" }
   tags: powerflex-tb
 
 - hosts: mdms
   name: "Configure PowerFlex storage"
   gather_facts: no
   roles:
-    - powerflex-config
+    - { role: "powerflex-config", when: "'EMC-ScaleIO-mdm' not in ansible_facts.packages" }
   tags: powerflex-config
-                
+
 - hosts: sdss
   name: "Install PowerFlex SDS"
   gather_facts: no
   become: true
   roles:
-    - powerflex-sds
+    - { role: "powerflex-sds", when: "'EMC-ScaleIO-sds' not in ansible_facts.packages" }
   tags: powerflex-sds
 
 - hosts: all
   name: "Install PowerFlex LIA"
   gather_facts: no
   become: true
-  roles: 
-    - powerflex-lia
+  roles:
+    - { role: "powerflex-lia", when: "'EMC-ScaleIO-lia' not in ansible_facts.packages" }
   tags: powerflex-lia
-                
+
 - hosts: sdcs
   name: "Install PowerFlex SDC"
   gather_facts: no
   become: true
   roles:
-    - powerflex-sdc
+    - { role: "powerflex-sdc", when: "'EMC-ScaleIO-sdc' not in ansible_facts.packages" }
   tags: powerflex-sdc
+