diff --git a/roles/homepage/tasks/main.yml b/roles/homepage/tasks/main.yml
index 91b570df5..f88503082 100644
--- a/roles/homepage/tasks/main.yml
+++ b/roles/homepage/tasks/main.yml
@@ -1,16 +1,19 @@
 - name: Create home directory
-  file: path={{ doc_root }}/home
-        mode=0755
-        owner={{ apache_user }}
-        group={{ apache_user }}
-        state=directory
+  file:
+    path: "{{ doc_root }}/home"
+    owner: "{{ apache_user }}"
+    group: "{{ apache_user }}"
+    mode: 0755
+    state: directory
 
 - name: Install admin homepage into apache2
-  template: src=iiab-homepage.conf
-            dest=/etc/{{ apache_config_dir }}/iiab-homepage.conf
+  template:
+    src: iiab-homepage.conf
+    dest: "/etc/{{ apache_config_dir }}/iiab-homepage.conf"
 
 - name: Enable the home page
-  file: src=/etc/{{ apache_config_dir }}/iiab-homepage.conf
-        dest=/etc/apache2/sites-enabled/iiab-homepage.conf
-        state=link
+  file:
+    src: "/etc/{{ apache_config_dir }}/iiab-homepage.conf"
+    dest: /etc/apache2/sites-enabled/iiab-homepage.conf
+    state: link
   when: is_debuntu
diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml
index 2789a2dd5..a9ed97c62 100644
--- a/roles/osm/tasks/main.yml
+++ b/roles/osm/tasks/main.yml
@@ -1,6 +1,7 @@
-- name: Install OSM required packages
-  package: name={{ item }}
-           state=present
+- name: Install OSM required packages (debuntu)
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
     - gcc
     - python-dev
@@ -9,9 +10,10 @@
     - libapache2-mod-xsendfile
   when: is_debuntu
 
-- name: Install OSM required packages
-  package: name={{ item }}
-           state=present
+- name: Install OSM required packages (not debuntu)
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
     - python-pip
     - gcc
@@ -22,27 +24,30 @@
   when: not is_debuntu
 
 # OSM wants a specific version do that first
-- name: Install Whoosh 2.6
-  pip: name=whoosh
-       virtualenv={{ osm_venv }}
-       virtualenv_site_packages=no
-       version=2.6
-       extra_args="--no-cache-dir"
+- name: Install Whoosh 2.6 (debuntu)
+  pip:
+    name: whoosh
+    virtualenv: "{{ osm_venv }}"
+    virtualenv_site_packages: no
+    version: 2.6
+    extra_args: "--no-cache-dir"
   when: internet_available and is_debuntu
 
-- name: Install Flask 0.12X
-  pip: name=Flask
-       virtualenv={{ osm_venv }}
-       virtualenv_site_packages=no
-       version=0.12.4
-       extra_args="--no-cache-dir"
+- name: Install Flask 0.12X (debuntu)
+  pip:
+    name: Flask
+    virtualenv: "{{ osm_venv }}"
+    virtualenv_site_packages: no
+    version: 0.12.4
+    extra_args: "--no-cache-dir"
   when: internet_available and is_debuntu
 
-- name: Install OSM with dependencies
-  pip: name={{ item }}
-       virtualenv={{ osm_venv }}
-       virtualenv_site_packages=no
-       extra_args="--no-cache-dir"
+- name: Install OSM with dependencies (debuntu)
+  pip:
+    name: "{{ item }}"
+    virtualenv: "{{ osm_venv }}"
+    virtualenv_site_packages: no
+    extra_args: "--no-cache-dir"
   with_items:
     - MarkupSafe
     - pytz
@@ -50,26 +55,29 @@
   when: internet_available and is_debuntu
 
 # OSM wants a specific version do that first
-- name: Install Whoosh 2.6
-  pip: name=whoosh
-       virtualenv={{ osm_venv }}
-       virtualenv_site_packages=no
-       version=2.6
+- name: Install Whoosh 2.6 (not debuntu)
+  pip:
+    name: whoosh
+    virtualenv: "{{ osm_venv }}"
+    virtualenv_site_packages: no
+    version: 2.6
 #       extra_args="--no-cache-dir"
   when: internet_available and not is_debuntu
 
-- name: Install Flask 0.12X
-  pip: name=Flask
-       virtualenv={{ osm_venv }}
-       virtualenv_site_packages=no
-       version=0.12.4
+- name: Install Flask 0.12X (not debuntu)
+  pip:
+    name: Flask
+    virtualenv: "{{ osm_venv }}"
+    virtualenv_site_packages: no
+    version: 0.12.4
 #       extra_args="--no-cache-dir"
   when: internet_available and not is_debuntu
 
-- name: Install OSM with dependencies
-  pip: name={{ item }}
-       virtualenv={{ osm_venv }}
-       virtualenv_site_packages=no
+- name: Install OSM with dependencies (not debuntu)
+  pip:
+    name: "{{ item }}"
+    virtualenv: "{{ osm_venv }}"
+    virtualenv_site_packages: no
 #       extra_args="--no-cache-dir"
   with_items:
     - MarkupSafe
@@ -77,81 +85,92 @@
     - Internet-in-a-Box
   when: internet_available and not is_debuntu
 
-- name: Set osm_path
+- name: Set osm_path (redhat)
   set_fact:
-     osm_path: "{{ osm_venv }}/{{ python_path }}/iiab"
+    osm_path: "{{ osm_venv }}/{{ python_path }}/iiab"
   when: osm_enabled and is_redhat
 
-- name: Set osm_path
+- name: Set osm_path (debuntu)
   set_fact:
-     osm_path: "{{ osm_venv }}/lib/python2.7/site-packages/iiab"
+    osm_path: "{{ osm_venv }}/lib/python2.7/site-packages/iiab"
   when: osm_enabled and is_debuntu
 
 - name: Point wsgi to virtual environment (all OS's)
-  lineinfile: dest={{ osm_venv }}/bin/iiab.wsgi
-              regexp="path_to_virtualenv = None"
-              line="path_to_virtualenv = '/usr/local/osm'"
-              state=present
+  lineinfile:
+    dest: "{{ osm_venv }}/bin/iiab.wsgi"
+    regexp: "path_to_virtualenv = None"
+    line: "path_to_virtualenv = '/usr/local/osm'"
+    state: present
 
 - name: Copy OSM config file (all OS's)
-  template: backup=no
-            src=osm.conf.j2
-            dest=/etc/{{ apache_config_dir }}/osm.conf
-            owner=root
-            group=root
-            mode=0644
+  template:
+    src: osm.conf.j2
+    dest: "/etc/{{ apache_config_dir }}/osm.conf"
+    owner: root
+    group: root
+    mode: 0644
+    backup: no
   when: osm_enabled
 
 - name: Create a link from sites-enabled to sites-available (debuntu)
-  file: src=/etc/{{ apache_config_dir }}/osm.conf
-        dest=/etc/apache2/sites-enabled/osm.conf
-        state=link
+  file:
+    src: "/etc/{{ apache_config_dir }}/osm.conf"
+    dest: /etc/apache2/sites-enabled/osm.conf
+    state: link
   when: osm_enabled and is_debuntu
 
 - name: Remove the link from sites-enabled to sites-available (debuntu)
-  file: dest=/etc/apache2/sites-enabled/osm.conf
-        state=absent
+  file:
+    dest: /etc/apache2/sites-enabled/osm.conf
+    state: absent
   when: not osm_enabled and is_debuntu
 
 - name: Remove the osm.conf (redhat)
-  file: dest=/{{ apache_config_dir }}/osm.conf
-        state=absent
+  file:
+    dest: "/{{ apache_config_dir }}/osm.conf"
+    state: absent
   when: not osm_enabled and is_redhat
 
 - name: Remove link to cgi (all OS's)
-  file: dest={{ doc_root }}/osm.wsgi
-        state=absent
+  file:
+    dest: "{{ doc_root }}/osm.wsgi"
+    state: absent
   when: not osm_enabled
 
 - name: Create link to cgi (all OS's)
-  file: src={{ osm_venv }}/bin/iiab.wsgi
-        dest={{ doc_root }}/osm.wsgi
-        owner=root
-        group=root
-        state=link
+  file:
+    src: "{{ osm_venv }}/bin/iiab.wsgi"
+    dest: "{{ doc_root }}/osm.wsgi"
+    owner: root
+    group: root
+    state: link
   when: osm_enabled
 
 - name: Create the knowledge data set folders
-  file: path=/library/knowledge/modules
-        state=directory
-        owner={{ apache_user }}
-        group={{ apache_user }}
+  file:
+    path: /library/knowledge/modules
+    state: directory
+    owner: "{{ apache_user }}"
+    group: "{{ apache_user }}"
 
 # the following was brought into OSM playbook from iiab-factory osm-fix script
 - name: Copy the files
-  template: src={{ item.src }} dest={{ item.dest }}
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
   with_items:
-     - { src: 'defaults.ini', dest: "{{ osm_path }}/" }
-     - { src: 'etc.iiab.conf', dest: '/etc/iiab.conf' }
-     - { src: 'map_search.py', dest: "{{ osm_path }}/map_search.py" }
-     - { src: 'map.html', dest: "{{ osm_path }}/static/map.html" }
-     - { src: 'l.control.geosearch.js', dest: "{{ osm_path }}/static/lib/leaflet/geosearch/l.control.geosearch.js" }
-     - { src: '{{ osm_path }}/static/map.html', dest: "{{ osm_path }}/static/index.html" }
+    - { src: 'defaults.ini', dest: "{{ osm_path }}/" }
+    - { src: 'etc.iiab.conf', dest: '/etc/iiab.conf' }
+    - { src: 'map_search.py', dest: "{{ osm_path }}/map_search.py" }
+    - { src: 'map.html', dest: "{{ osm_path }}/static/map.html" }
+    - { src: 'l.control.geosearch.js', dest: "{{ osm_path }}/static/lib/leaflet/geosearch/l.control.geosearch.js" }
+    - { src: "{{ osm_path }}/static/map.html", dest: "{{ osm_path }}/static/index.html" }
   when: osm_enabled
 
 - name: Restart httpd service
-  service: name={{ apache_service }}
-           state=restarted
+  service:
+    name: "{{ apache_service }}"
+    state: restarted
 
 - name: Add 'osm' to list of services at /etc/iiab/iiab.ini
   ini_file: