diff --git a/roles/kalite/tasks/assessment.yml b/roles/kalite/tasks/assessment.yml
index 43839eb7f..73faec727 100644
--- a/roles/kalite/tasks/assessment.yml
+++ b/roles/kalite/tasks/assessment.yml
@@ -8,7 +8,7 @@
 - name: Run the assessment setup using kalite manage
   command: "{{ kalite_program }} manage unpack_assessment_zip {{ downloads_dir }}/khan_assessment.zip"
   environment:
-     KALITE_HOME: "{{ kalite_root }}"
+    KALITE_HOME: "{{ kalite_root }}"
   async: 900
   poll: 10
   when: not khan_assessment_installed.stat.exists or khan_assessment_installed.stat.size < 20000
diff --git a/roles/kalite/tasks/enable.yml b/roles/kalite/tasks/enable.yml
index ed278a863..7a95aabeb 100644
--- a/roles/kalite/tasks/enable.yml
+++ b/roles/kalite/tasks/enable.yml
@@ -2,26 +2,30 @@
 # And the systemd unit files should be defined
 
 - name: Enable 'kalite-serve' service
-  service: name=kalite-serve
-           enabled=yes
-           state=started
+  service:
+    name: kalite-serve
+    enabled: yes
+    state: started
 
 - name: Disable 'kalite-serve' service
-  service: name=kalite-serve
-           enabled=no
-           state=stopped
+  service:
+    name: kalite-serve
+    enabled: no
+    state: stopped
   when: not kalite_enabled
 
 # Since Fedora 18 we don't have a separate unit file for kalite-cron
 
 - name: Disable kalite cron server F18
-  service: name=kalite-cron
-           enabled=no
-           state=stopped
+  service:
+    name: kalite-cron
+    enabled: no
+    state: stopped
   when: not kalite_cron_enabled and is_F18
 
 - name: Enable kalite cron server F18
-  service: name=kalite-cron
-           enabled=yes
-           state=started
+  service:
+    name: kalite-cron
+    enabled: yes
+    state: started
   when: kalite_cron_enabled and is_F18
diff --git a/roles/kalite/tasks/install-f18.yml b/roles/kalite/tasks/install-f18.yml
index bad6c551a..7d38866fc 100644
--- a/roles/kalite/tasks/install-f18.yml
+++ b/roles/kalite/tasks/install-f18.yml
@@ -1,66 +1,75 @@
 # This is for Fedora 18, assumed to be an XO
 
 - name: Install dependent packages (Fedora 18)
-  package: name={{ item }}
-           state=present
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
     - python-psutil
     - expect
   when: is_F18
 
 - name: Install dependent pip packages (Fedora 18)
-  pip: name=selenium
+  pip:
+    name: selenium
   when: internet_available and is_F18
 
 - name: Determine if KA Lite is already downloaded
-  stat: path={{ downloads_dir }}/ka-lite
+  stat:
+    path: "{{ downloads_dir }}/ka-lite"
   register: kalite
 
 - name: Download the latest KA Lite repo
-  git: repo={{ kalite_repo_url }}
-       dest={{ downloads_dir }}/ka-lite
-       depth=1
-       version="0.13.x"
+  git:
+    repo: "{{ kalite_repo_url }}"
+    dest: "{{ downloads_dir }}/ka-lite"
+    depth: 1
+    version: 0.13.x
   ignore_errors: yes
   when: internet_available and kalite.stat.exists is defined and not kalite.stat.exists
 
 - name: Create iiab-kalite user and password (Fedora 18)
-  user: name={{ kalite_user }}
-        password={{ kalite_password_hash }}
-        update_password=on_create
+  user:
+    name: "{{ kalite_user }}"
+    password: "{{ kalite_password_hash }}"
+    update_password: on_create
 
 - name: Create kalite_root directory (Fedora 18)
-  file: path={{ kalite_root }}
-        owner=root
-        group=root
-        mode=0755
-        state=directory
+  file:
+    path: "{{ kalite_root }}"
+    owner: root
+    group: root
+    mode: 0755
+    state: directory
 
 - name: Copy the KA Lite repo into place (Fedora 18)
   command: "rsync -at {{ downloads_dir }}/ka-lite/ {{ kalite_root }}"
 
 - name: Make kalite_user owner
-  file: path={{ kalite_root }}
-        owner={{ kalite_user }}
-        group={{ kalite_user }}
-        recurse=yes
-        state=directory
+  file:
+    path: "{{ kalite_root }}"
+    owner: "{{ kalite_user }}"
+    group: "{{ kalite_user }}"
+    recurse: yes
+    state: directory
 
 # local_settings is deprecated
 - name: Copy local_settings file
-  template: src=f18/local_settings.py.j2
-            dest="{{ kalite_root }}/kalite/local_settings.py"
-            owner={{ kalite_user }}
-            group={{ kalite_user }}
-            mode=0644
+  template:
+    src: f18/local_settings.py.j2
+    dest: "{{ kalite_root }}/kalite/local_settings.py"
+    owner: "{{ kalite_user }}"
+    group: "{{ kalite_user }}"
+    mode: 0644
 
 - name: Create kalite-serve & kalite-cron services, and iiab_cronservectl.sh
-  template: backup=no
-            src={{ item.src }}
-            dest={{ item.dest }}
-            owner=root
-            group=root
-            mode={{ item.mode }}
+  template:
+    backup: no
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    owner: root
+    group: root
+    mode: "{{ item.mode }}"
   with_items:
     - { src: 'f18/kalite-serve.service.j2', dest: '/etc/systemd/system/kalite-serve.service', mode: '0644'}
     - { src: 'f18/kalite-cron.service.j2', dest: '/etc/systemd/system/kalite-cron.service', mode: '0644'}
diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml
index 84c508fe1..1cbbdfa5a 100644
--- a/roles/kalite/tasks/main.yml
+++ b/roles/kalite/tasks/main.yml
@@ -13,7 +13,8 @@
   when: not is_F18
 
 - name: See if KA Lite is already configured
-  stat: path="{{ kalite_db_name }}"
+  stat:
+    path: "{{ kalite_db_name }}"
   register: kalite_installed
 
 - include_tasks: install-f18.yml
diff --git a/roles/kalite/tasks/setup.yml b/roles/kalite/tasks/setup.yml
index 2ad239833..05b8d5674 100644
--- a/roles/kalite/tasks/setup.yml
+++ b/roles/kalite/tasks/setup.yml
@@ -1,15 +1,16 @@
 # This is for an OS other than Fedora 18
 
 - name: Create kalite_root directory
-  file: path={{ kalite_root }}/httpsrv/static
-        owner=root
-        group=root
-        mode=0755
-        state=directory
+  file:
+    path: "{{ kalite_root }}/httpsrv/static"
+    owner: root
+    group: root
+    mode: 0755
+    state: directory
 
 - name: Run the setup using 'kalite manage'
   command: "{{ kalite_program }} manage setup --username={{ kalite_admin_user }} --password={{ kalite_admin_password }} --noinput"
   environment:
-     KALITE_HOME: "{{ kalite_root }}"
+    KALITE_HOME: "{{ kalite_root }}"
   async: 900
   poll: 10