diff --git a/.ansible-lint b/.ansible-lint
index 5cb16f4..0a12839 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -5,8 +5,6 @@ skip_list:
 - fqcn-builtins
 - yaml[line-length]
 - risky-shell-pipe
-- no-changed-when
-- key-order[task]
 
 warn_list:
 - role-name
diff --git a/tasks/dokku-daemon.yml b/tasks/dokku-daemon.yml
index 9ce295b..ee0bf34 100644
--- a/tasks/dokku-daemon.yml
+++ b/tasks/dokku-daemon.yml
@@ -1,4 +1,6 @@
-- block:
+- name: Install dokku-daemon
+  when: dokku_daemon_install
+  block:
   - name: ensure github.com is a known host
     lineinfile:
       dest: /root/.ssh/known_hosts
@@ -10,7 +12,7 @@
     tags:
     - dokku-daemon
 
-  # Needed for Debian, see https://github.com/dokku/dokku-daemon/issues/27
+    # Needed for Debian, see https://github.com/dokku/dokku-daemon/issues/27
   - name: install socat package
     apt:
       name: socat
@@ -42,4 +44,3 @@
     - start dokku-daemon
     tags:
     - dokku-daemon
-  when: dokku_daemon_install
diff --git a/tasks/main.yml b/tasks/main.yml
index 198cfae..88d3e64 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -44,6 +44,7 @@
   - dokku
   - dokku-plugins
   when: dokku_plugins is defined and installed_dokku_plugins.stdout.find(item.name) == -1
+  changed_when: true
   with_items: "{{ dokku_plugins }}"
 
 - name: dokku plugin:update
@@ -60,7 +61,7 @@
   - dokku
   - dokku-plugins
 
-- name: dokku:plugin install-dependencies
+- name: dokku:plugin install-dependencies  # noqa: no-changed-when
   command: dokku plugin:install-dependencies
   tags:
   - dokku
diff --git a/tasks/ssh-key.yml b/tasks/ssh-key.yml
index ba9af48..97f93e0 100644
--- a/tasks/ssh-key.yml
+++ b/tasks/ssh-key.yml
@@ -10,3 +10,4 @@
   shell: echo "{{ ssh_key }}" | dokku ssh-keys:add {{ username }}
   no_log: true
   when: force_add or ssh_key_list.find(sha256.stdout) == -1
+  changed_when: true