diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cdc96b..cbafd52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,21 @@
 ---
 -->
 
+## 2021-04-18, v2.8.3
+
+### Notable changes
+
+ - Typo fix in README.md #110
+ - Fixed check mode for cgroup test #111
+ - Added check mode into molecule test sequence
+ - `inventory.yml` is now `blockinfile`
+
+### Contributors
+
+ - [@bdronneau](https://github.com/bdronneau)
+
+---
+
 ## 2021-04-10, v2.8.2
 
 ### Notable changes
diff --git a/molecule/autodeploy/molecule.yml b/molecule/autodeploy/molecule.yml
index ecd9981..3e01012 100644
--- a/molecule/autodeploy/molecule.yml
+++ b/molecule/autodeploy/molecule.yml
@@ -4,6 +4,22 @@ dependency:
   name: galaxy
 driver:
   name: docker
+scenario:
+  test_sequence:
+    - dependency
+    - lint
+    - cleanup
+    - destroy
+    - syntax
+    - create
+    - prepare
+    - check
+    - converge
+    - idempotence
+    - side_effect
+    - verify
+    - cleanup
+    - destroy
 lint: |
   set -e
   yamllint -s .
diff --git a/molecule/debug/molecule.yml b/molecule/debug/molecule.yml
index ecd9981..3e01012 100644
--- a/molecule/debug/molecule.yml
+++ b/molecule/debug/molecule.yml
@@ -4,6 +4,22 @@ dependency:
   name: galaxy
 driver:
   name: docker
+scenario:
+  test_sequence:
+    - dependency
+    - lint
+    - cleanup
+    - destroy
+    - syntax
+    - create
+    - prepare
+    - check
+    - converge
+    - idempotence
+    - side_effect
+    - verify
+    - cleanup
+    - destroy
 lint: |
   set -e
   yamllint -s .
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index ecd9981..3e01012 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -4,6 +4,22 @@ dependency:
   name: galaxy
 driver:
   name: docker
+scenario:
+  test_sequence:
+    - dependency
+    - lint
+    - cleanup
+    - destroy
+    - syntax
+    - create
+    - prepare
+    - check
+    - converge
+    - idempotence
+    - side_effect
+    - verify
+    - cleanup
+    - destroy
 lint: |
   set -e
   yamllint -s .
diff --git a/molecule/docker/molecule.yml b/molecule/docker/molecule.yml
index 0262e2f..1b313e9 100644
--- a/molecule/docker/molecule.yml
+++ b/molecule/docker/molecule.yml
@@ -4,6 +4,22 @@ dependency:
   name: galaxy
 driver:
   name: docker
+scenario:
+  test_sequence:
+    - dependency
+    - lint
+    - cleanup
+    - destroy
+    - syntax
+    - create
+    - prepare
+    - check
+    - converge
+    - idempotence
+    - side_effect
+    - verify
+    - cleanup
+    - destroy
 lint: |
   set -e
   yamllint -s .
diff --git a/molecule/highavailabilitydb/molecule.yml b/molecule/highavailabilitydb/molecule.yml
index d388fca..699d434 100644
--- a/molecule/highavailabilitydb/molecule.yml
+++ b/molecule/highavailabilitydb/molecule.yml
@@ -4,6 +4,22 @@ dependency:
   name: galaxy
 driver:
   name: docker
+scenario:
+  test_sequence:
+    - dependency
+    - lint
+    - cleanup
+    - destroy
+    - syntax
+    - create
+    - prepare
+    - check
+    - converge
+    - idempotence
+    - side_effect
+    - verify
+    - cleanup
+    - destroy
 lint: |
   set -e
   yamllint -s .
diff --git a/molecule/highavailabilityetcd/molecule.yml b/molecule/highavailabilityetcd/molecule.yml
index 1c59702..8b642a8 100644
--- a/molecule/highavailabilityetcd/molecule.yml
+++ b/molecule/highavailabilityetcd/molecule.yml
@@ -4,6 +4,22 @@ dependency:
   name: galaxy
 driver:
   name: docker
+scenario:
+  test_sequence:
+    - dependency
+    - lint
+    - cleanup
+    - destroy
+    - syntax
+    - create
+    - prepare
+    - check
+    - converge
+    - idempotence
+    - side_effect
+    - verify
+    - cleanup
+    - destroy
 lint: |
   set -e
   yamllint -s .
diff --git a/molecule/nodeploy/molecule.yml b/molecule/nodeploy/molecule.yml
index ecd9981..3e01012 100644
--- a/molecule/nodeploy/molecule.yml
+++ b/molecule/nodeploy/molecule.yml
@@ -4,6 +4,22 @@ dependency:
   name: galaxy
 driver:
   name: docker
+scenario:
+  test_sequence:
+    - dependency
+    - lint
+    - cleanup
+    - destroy
+    - syntax
+    - create
+    - prepare
+    - check
+    - converge
+    - idempotence
+    - side_effect
+    - verify
+    - cleanup
+    - destroy
 lint: |
   set -e
   yamllint -s .
diff --git a/tasks/build/preconfigure-k3s.yml b/tasks/build/preconfigure-k3s.yml
index 40d36a1..5456724 100644
--- a/tasks/build/preconfigure-k3s.yml
+++ b/tasks/build/preconfigure-k3s.yml
@@ -62,22 +62,25 @@
     - k3s_build_cluster
 
 - name: Ensure ansible_host is mapped to inventory_hostname
-  ansible.builtin.lineinfile:
+  ansible.builtin.blockinfile:
     path: /tmp/inventory.txt
-    line: >-
-      {{ item }}
+    block: |
+      {% for host in ansible_play_hosts_all %}
+      {% filter replace('\n', ' ') %}
+      {{ host }}
       @@@
-      {{ hostvars[item].ansible_host | default(hostvars[item].ansible_fqdn) }}
+      {{ hostvars[host].ansible_host | default(hostvars[host].ansible_fqdn) }}
       @@@
-      C_{{ hostvars[item].k3s_control_node }}
+      C_{{ hostvars[host].k3s_control_node }}
       @@@
-      P_{{ hostvars[item].k3s_primary_control_node | default(False) }}
+      P_{{ hostvars[host].k3s_primary_control_node | default(False) }}
+      {% endfilter %}
+      @@@ END:{{ host }}
+      {% endfor %}
     create: true
-    regexp: "^{{ item }} @@@ {{ hostvars[item].ansible_host | default(hostvars[item].ansible_fqdn) }}"
     mode: 0600
-  loop: "{{ ansible_play_hosts_all }}"
   check_mode: false
-  when: hostvars[item].k3s_control_node is defined
+  when: k3s_control_node is defined
 
 - name: Delegate an initializing control plane node
   block:
diff --git a/tasks/validate/environment/remote/cgroups.yml b/tasks/validate/environment/remote/cgroups.yml
index e91af95..a75a90c 100644
--- a/tasks/validate/environment/remote/cgroups.yml
+++ b/tasks/validate/environment/remote/cgroups.yml
@@ -5,6 +5,7 @@
     cmd: 'grep -E "^{{ cgroup.name }}\s+.*\s+1$" /proc/cgroups'
   failed_when: false
   changed_when: false
+  check_mode: false
   register: k3s_check_cgroup_option
 
 - name: Fail if {{ cgroup.name }} cgroup is not enabled