diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 10b5b51..bafac6d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
           - distro: geerlingguy/docker-fedora34-ansible:latest
             scenario: highavailabilitydb
             prebuilt: 'true'
-          - distro: geerlingguy/docker-debian10-ansible:latest
+          - distro: geerlingguy/docker-fedora33-ansible:latest
             scenario: autodeploy
           - distro: xanmanning/docker-alpine-ansible:3.16
             scenario: highavailabilityetcd
diff --git a/molecule/autodeploy/converge.yml b/molecule/autodeploy/converge.yml
index 15df83a..f46fa49 100644
--- a/molecule/autodeploy/converge.yml
+++ b/molecule/autodeploy/converge.yml
@@ -6,7 +6,6 @@
     molecule_is_test: true
     k3s_release_version: latest
     k3s_build_cluster: false
-    k3s_control_token: 55ba04e5-e17d-4535-9170-3e4245453f4d
     k3s_install_dir: /opt/k3s/bin
     k3s_config_file: /opt/k3s/etc/k3s.yaml
     k3s_server:
@@ -20,6 +19,6 @@
       - url: https://raw.githubusercontent.com/metallb/metallb/v0.9.6/manifests/namespace.yaml
         filename: 05-metallb-namespace.yml
     k3s_service_env_vars:
-      GOGC: 10
+      K3S_TEST_VAR: "Hello world!"
   roles:
     - role: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
diff --git a/tasks/ensure_control_plane_started_openrc.yml b/tasks/ensure_control_plane_started_openrc.yml
index 9926173..fe9326d 100644
--- a/tasks/ensure_control_plane_started_openrc.yml
+++ b/tasks/ensure_control_plane_started_openrc.yml
@@ -9,7 +9,7 @@
   until: k3s_service_start_k3s is succeeded
   retries: 3
   delay: 3
-  # failed_when:
-  #   - k3s_service_start_k3s is not succeeded
-  #   - not ansible_check_mode
+  failed_when:
+    - k3s_service_start_k3s is not succeeded
+    - not ansible_check_mode
   become: "{{ k3s_become }}"