diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml
index 4634d3c5c..e2d8f5610 100644
--- a/roles/2-common/tasks/packages.yml
+++ b/roles/2-common/tasks/packages.yml
@@ -1,6 +1,7 @@
 - name: Install yum packages (redhat)
-  package: name={{ item }}
-           state=present
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
    - yum-utils
    - createrepo
@@ -13,19 +14,21 @@
    - avahi-tools
   when: is_redhat
 
-- name: Download usbmount -- not in Debian Stretch (debian-9)
+- name: Download usbmount -- not in Debian Stretch (debian_9)
   get_url:
     url: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb"
     dest: "{{ downloads_dir }}"
+    timeout: "{{ download_timeout }}"
   when: is_debian_9
 
-- name: Install usbmount (debian-9)
+- name: Install usbmount (debian_9)
   command: apt install -y {{ downloads_dir }}/usbmount_0.0.14.1_all.deb
   when: is_debian_9
 
 - name: Install packages (debuntu)
-  package: name={{ item }}
-           state=present
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
     - inetutils-syslogd
     - wpasupplicant
@@ -37,8 +40,9 @@
   when: is_debuntu
 
 - name: Install common packages
-  package: name={{ item }}
-           state=present
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
    - acpid
    - mlocate
@@ -74,8 +78,9 @@
 #  command: python {{ downloads_dir }}/get-pip.py
 
 - name: Install common Python packages
-  package: name={{ item }}
-           state=present
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
    - python-pip
    - python-setuptools