diff --git a/playbooks/tests/firewall-rules.yml b/playbooks/tests/firewall-rules.yml
index 605ddf34db3f43bbb520b8a721aadf153d7d6ee7..c0990505e570c7fc3a017fd607d5cc2865e7f46d 100755
--- a/playbooks/tests/firewall-rules.yml
+++ b/playbooks/tests/firewall-rules.yml
@@ -18,7 +18,7 @@
     - include_vars:
         file: ressources/firewall/rules.yml
 
-    - include: ressources/firewall/listen.yml
+    - include_tasks: ressources/firewall/listen.yml
       # loop over listen vars (named outer_item) and call firewall-listen
       loop: "{{ listen }}"
       loop_control:
@@ -35,7 +35,7 @@
         file: ressources/firewall/rules.yml
 
     - name: test rules
-      include: ressources/firewall/test-rule.yml
+      include_tasks: ressources/firewall/test-rule.yml
       # loop over listen vars (named outer_item) and call firewall-listen
       loop: "{{ test }}"
       loop_control:
diff --git a/requirements.dev.txt b/requirements.dev.txt
index 959ef80a5ede3157b027e4fd8404f2121b56fc49..b37ddd6d115fc16769022ef2cf44e1d7f7215c1a 100644
--- a/requirements.dev.txt
+++ b/requirements.dev.txt
@@ -1,7 +1,5 @@
 ansible-lint
 flake8
-#git+https://github.com/atmaniak/molecule@e03437923b302fca1bd7b4f6030c6956ad00367a#egg=molecule[docker]
-#git+https://github.com/ansible-community/molecule@bc795e717108af2f8e63bbb05fcc4d7212ef62cd#egg=molecule[docker]
-molecule[docker]==3.2.2
+molecule[docker]
 pytest-testinfra
 yamllint
diff --git a/requirements.txt b/requirements.txt
index 89d375f50dc49fe355d0db04f085e2a1437e78d9..dfb6cb2f8d99d1881758e60827cb5fe9eceb4bd8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-ansible<2.10
+ansible<5.3
 netaddr
 pyyaml
 openstacksdk
diff --git a/roles/mediavault/tasks/main.yml b/roles/mediavault/tasks/main.yml
index cbeea8e8b2bbbb2b85b339ab76182320bf490f2a..ca03f5ede2c182976a74bdf3e4c01a18acca840e 100644
--- a/roles/mediavault/tasks/main.yml
+++ b/roles/mediavault/tasks/main.yml
@@ -15,7 +15,7 @@
     ssh_key_file: .ssh/id_ed25519
 
 # MAILER
-- include: mailer.yml
+- include_tasks: mailer.yml
 
 # FIREWALL
 - name: firewall
diff --git a/roles/postgres/defaults/main.yml b/roles/postgres/defaults/main.yml
index 9bf750b55d2d9c85ae1930f3a0a04f08ba2a4f6b..b1ef40b9c7ec4d5f2bf62b088a2662ba9771e1a3 100644
--- a/roles/postgres/defaults/main.yml
+++ b/roles/postgres/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
 
 pg_packages:
+  - acl
   - postgresql
 
 pg_version: 11
diff --git a/roles/sysconfig/tasks/main.yml b/roles/sysconfig/tasks/main.yml
index 25646b1f3a4db3c4e4cc969daa8055fb198efc28..6f8ce72173f42340581be7ddcd87e8767e7e20b1 100644
--- a/roles/sysconfig/tasks/main.yml
+++ b/roles/sysconfig/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- include: repos.yml
+- include_tasks: repos.yml
 
 # Upgrade already installed packages to latest version and clean system
 
@@ -11,6 +11,7 @@
   register: apt_status
   retries: 60
   until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
+  changed_when: false
 
 - name: apt dist upgrade
   apt:
@@ -117,10 +118,10 @@
   include_role:
     name: ferm-configure
 
-- include: logs.yml
+- include_tasks: logs.yml
 
-- include: locale.yml
+- include_tasks: locale.yml
 
-- include: ntp.yml
+- include_tasks: ntp.yml
 
 ...