diff --git a/playbooks/bench.yml b/playbooks/bench.yml
index 301f29b492c52317063c69f9e67d99e78406592c..d653897e9b10be6c2e60bcb55edd9b6923ecb36f 100755
--- a/playbooks/bench.yml
+++ b/playbooks/bench.yml
@@ -13,10 +13,12 @@
     - bench-server
   tasks:
     - name: restart bench-server
+      tags:
+        - never
+        - prepare-bench
       service:
         name: bench-server
         state: restarted
-      tags: [ 'never', 'prepare-bench' ]
 
 - name: DEPLOY BENCHMARK WORKERS
   hosts: bench_worker
@@ -25,9 +27,11 @@
     - bench-worker
   tasks:
     - name: restart bench-worker
+      tags:
+        - never
+        - prepare-bench
       service:
         name: bench-worker
         state: restarted
-      tags: [ 'never', 'prepare-bench' ]
 
 ...
diff --git a/requirements.dev.txt b/requirements.dev.txt
index 11c8fe210653e0d18dab753146d6134b9a848267..759503fad19646a08ff47f5545c7314bdb3836f8 100644
--- a/requirements.dev.txt
+++ b/requirements.dev.txt
@@ -1,6 +1,6 @@
 ansible-lint
 flake8
-git+git://github.com/atmaniak/molecule@e03437923b302fca1bd7b4f6030c6956ad00367a#egg=molecule[docker]
-#molecule[docker]
+#git+git://github.com/atmaniak/molecule@e03437923b302fca1bd7b4f6030c6956ad00367a#egg=molecule[docker]
+molecule[docker]
 pytest-testinfra
 yamllint
diff --git a/roles/mediaimport/tasks/main.yml b/roles/mediaimport/tasks/main.yml
index e3c979b7e5fe535f4889952bfac44ec98b862b2e..bf56d60571f46fc00ffcdd5693ab6c3fa89921b5 100644
--- a/roles/mediaimport/tasks/main.yml
+++ b/roles/mediaimport/tasks/main.yml
@@ -86,7 +86,7 @@
     path: /etc/ssl/{{ ansible_fqdn }}/key.pem
 
 - name: generate an csr
-  when: mediaimport_privkey is changed
+  when: mediaimport_privkey is changed  # noqa no-handler
   register: mediaimport_csr
   openssl_csr:
     path: /etc/ssl/{{ ansible_fqdn }}/csr.pem
@@ -94,7 +94,7 @@
     common_name: "{{ ansible_fqdn }}"
 
 - name: generate a self-signed certificate
-  when: mediaimport_csr is changed
+  when: mediaimport_csr is changed  # noqa no-handler
   register: mediaimport_cert
   openssl_certificate:
     path: /etc/ssl/{{ ansible_fqdn }}/cert.pem
@@ -103,7 +103,7 @@
     provider: selfsigned
 
 - name: concatenate key and certificate
-  when: mediaimport_cert is changed
+  when: mediaimport_cert is changed  # noqa no-handler
   notify: restart pure-ftpd
   shell: >
     cat /etc/ssl/{{ ansible_fqdn }}/key.pem /etc/ssl/{{ ansible_fqdn }}/cert.pem > /etc/ssl/private/pure-ftpd.pem;
diff --git a/roles/mediaserver/tasks/main.yml b/roles/mediaserver/tasks/main.yml
index 45f2ecf9e0dbcfa4b040c547e8ea621d5e50eedd..bdbfcb667dc5aa96f4ec2fce6c433403e7f6b65f 100644
--- a/roles/mediaserver/tasks/main.yml
+++ b/roles/mediaserver/tasks/main.yml
@@ -92,7 +92,7 @@
   throttle: 1
 
 - name: synchronize configuration between servers
-  ignore_errors: true
+  ignore_errors: true  # noqa ignore-errors
   when:
     - groups['mediaserver'] | length > 1
     - inventory_hostname != groups['mediaserver'][0]
@@ -119,7 +119,7 @@
   tags: mediaserver-synchronize
 
 - name: synchronize letsencrypt configuration between servers
-  ignore_errors: true
+  ignore_errors: true  # noqa ignore-errors
   when:
     - groups['mediaserver'] | length > 1
     - inventory_hostname != groups['mediaserver'][0]