diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index 0701212..2e50ea4 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -1,3 +1,6 @@
 ---
 - name: Define OpenVSwitch repo packages
-  package: name="centos-release-ovirt42" state=latest update_cache=yes
+  package:
+    name: "centos-release-ovirt42"
+    state: present
+    update_cache: yes
diff --git a/tasks/main.yml b/tasks/main.yml
index 442f20e..72bbbee 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,18 +3,27 @@
   include_vars: "{{ ansible_os_family }}.yml"
 
 - name: remove old packages
-  package: name="{{ openvswitch_remove_packages }}" state=absent update_cache=yes
+  package:
+    name: "{{ openvswitch_remove_packages }}"
+    state: absent
+    update_cache: yes
   notify: Restart openvswitch 
 
 - name: Include tasks for {{ ansible_os_family }}
   include_tasks: "{{ ansible_os_family }}.yml"
 
 - name: install packages
-  package: name="{{ openvswitch_packages }}" state=latest update_cache=yes
+  package:
+    name: "{{ openvswitch_packages }}"
+    state: present
+    update_cache: yes
   notify: Restart openvswitch
 
 - name: Enable openvswitch
-  service: name="{{ openvswitch_service }}" state=started enabled=yes
+  service:
+    name: "{{ openvswitch_service }}"
+    state: started
+    enabled: yes
 
 - name: Add Openvswitch default bridge
   openvswitch_bridge: