diff --git a/handlers/main.yml b/handlers/main.yml
index c024c82..07f4e20 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -16,10 +16,10 @@
   service: name=resolvconf state=restarted
 
 - name: reload mailer
-  service: name={{ common_mailer_mailer }} state=reloaded
+  service: name="{{ common_mailer_mailer }}" state=reloaded
 
 - name: restart mailer
-  service: name={{ common_mailer_mailer }} state=restarted
+  service: name="{{ common_mailer_mailer }}" state=restarted
 
 - name: newaliases
   command: newaliases
diff --git a/tasks/apt.yml b/tasks/apt.yml
index 3f645bd..d65ee34 100644
--- a/tasks/apt.yml
+++ b/tasks/apt.yml
@@ -1,7 +1,7 @@
 ---
 - name: apt - add apt keys
-  apt_key: id={{ item.id }} url={{ item.url }} file={{ item.file }} state={{ item.state }}
-  with_items: {{ common_apt_keys }}
+  apt_key: id="{{ item.id }}" url="{{ item.url }}" file="{{ item.file }}" state="{{ item.state }}"
+  with_items: "{{ common_apt_keys }}"
 
 - name: apt - remove /etc/apt/sources.list.d/*
   file: path=/etc/apt/sources.list.d/* state=absent
@@ -10,17 +10,17 @@
   file: path=/etc/apt/sources.list.d/ state=directory owner=root group=root mode=0755
 
 - name: apt - add repositories
-  apt_repository: repo={{ item }} update_cache=yes
-  with_items: {{ common_apt_repositories }}
+  apt_repository: repo="{{ item }}" update_cache=yes
+  with_items: "{{ common_apt_repositories }}"
 
 - name: apt - remove /etc/apt/sources.list
   file: path=/etc/apt/sources.list state=absent
   notify: apt-get update
 
 - name: install basic tools
-  apt: pkg={{ item }} cache_valid_time=3600 update_cache=yes
-  with_items: {{ common_basic_packages }}
+  apt: pkg="{{ item }}" cache_valid_time=3600 update_cache=yes
+  with_items: "{{ common_basic_packages }}"
 
-- name: apt - upgrade system
-  apt: upgrade={{ common_apt_upgrade_policy }}
-  when: common_apt_upgrade_policy
+#- name: apt - upgrade system
+#  apt: upgrade="{{ common_apt_upgrade_policy }}"
+#  when: common_apt_upgrade_policy