diff --git a/roles/osm/defaults/main.yml b/roles/osm/defaults/main.yml
index d6db98c7a..dc86b1e4f 100644
--- a/roles/osm/defaults/main.yml
+++ b/roles/osm/defaults/main.yml
@@ -1,2 +1,3 @@
 osm_install: True
 osm_enabled: False
+osm_path: ""
diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml
index 3e0a77f5a..d23ce97dc 100644
--- a/roles/osm/tasks/main.yml
+++ b/roles/osm/tasks/main.yml
@@ -70,6 +70,7 @@
 - name: Set osm_path
   set_fact:
      osm_path: "{{ python_path }}iiab"
+  when: osm_enabled
 
 - name: Copy IIAB config file
   template: backup=yes
@@ -78,6 +79,7 @@
             owner=root
             group=root
             mode=0644
+  when: osm_enabled
 
 - name: Create a link from sites-enabled to sites-available
   file: src=/etc/apache2/sites-available/osm.conf
@@ -90,13 +92,18 @@
         state=absent
   when: not osm_enabled and is_debuntu
 
+- name: Redhat - Remove the osm.conf
+  file: dest=/{{ apache_config_dir }}/osm.conf
+        state=absent
+  when: not osm_enabled and is_redhat
+
 - name: Create link to cgi
   file: src=/bin/iiab.wsgi
         dest={{ doc_root}}/osm.wsgi
         owner=root
         group=root
         state=link
-  when: not is_debuntu
+  when: not is_debuntu and osm_enabled
 
 - name: Create link to cgi
   file: src=/usr/local/bin/iiab.wsgi
@@ -104,7 +111,7 @@
         owner=root
         group=root
         state=link
-  when: is_debuntu
+  when: is_debuntu and osm_enabled
 
 - name: Restart httpd service
   service: name={{ apache_service }}
@@ -127,6 +134,7 @@
      - { src: 'l.control.geosearch.js', dest: "{{ osm_path }}/static/lib/leaflet/geosearch/l.control.geosearch.js" }
 #  end of imported osm-fix
      - { src: '{{ osm_path }}/static/map.html', dest: "{{ osm_path }}/static/index.html" }
+  when: osm_enabled
 
 - name: add osm to service list
   ini_file: dest='{{ service_filelist }}'