diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bafac6d..d5efff6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
           - distro: xanmanning/docker-alpine-ansible:3.16
             scenario: highavailabilityetcd
             prebuilt: 'false'
-          - distro: geerlingguy/docker-rockylinux8-ansible:latest
+          - distro: geerlingguy/docker-rockylinux9-ansible:latest
             scenario: highavailabilityetcd
             prebuilt: 'true'
 
diff --git a/molecule/highavailabilityetcd/converge.yml b/molecule/highavailabilityetcd/converge.yml
index c434f13..01de3fe 100644
--- a/molecule/highavailabilityetcd/converge.yml
+++ b/molecule/highavailabilityetcd/converge.yml
@@ -5,15 +5,17 @@
   become: true
   vars:
     molecule_is_test: true
+    k3s_release_version: "v1.21"
     k3s_use_experimental: true
     k3s_etcd_datastore: true
     k3s_server:
       secrets-encryption: true
     k3s_agent:
       node-ip: "{{ ansible_default_ipv4.address }}"
-      # snapshotter: native
+      snapshotter: native
+      selinux: "{{ ansible_os_family | lower == 'redhat' }}"
     k3s_skip_validation: "{{ k3s_service_handler[ansible_service_mgr] == 'service' }}"
-    k3s_skip_post_checks: "{{ ansible_os_family | lower == 'redhat' }}"
+    # k3s_skip_post_checks: "{{ ansible_os_family | lower == 'redhat' }}"
   pre_tasks:
     - name: Set each node to be a control node
       ansible.builtin.set_fact:
diff --git a/templates/k3s.service.j2 b/templates/k3s.service.j2
index fdab38f..040d72f 100644
--- a/templates/k3s.service.j2
+++ b/templates/k3s.service.j2
@@ -26,6 +26,7 @@ Environment={{ env_var }}="{{ k3s_service_env_vars[env_var] }}"
 {% if k3s_service_env_file is defined and k3s_service_env_file %}
 EnvironmentFile={{ k3s_service_env_file }}
 {% endif %}
+ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service'
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
 {% filter regex_replace('\s+', ' ') %}