diff --git a/defaults/main.yaml b/defaults/main.yaml
index b2fc6eb..9f0e0a9 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -41,27 +41,30 @@ docker_users: [sthings]
 
 # kind
 install_kind: true
-kind_version: 0.22.0
-kind_url: "https://github.com/kubernetes-sigs/kind/releases/download/v{{ kind_version }}/kind-linux-amd64"
+kind_version: 0.24.0
 kind_cluster_name: kind1
-kubectl_version: 1.30.0
+kubectl_version: v1.30.2
 kind_api_port: 6443
 kind_server: 127.0.0.1
 
 bin:
   kubectl:
-    bin_name: kubectl
+    bin_name: "kubectl"
     bin_version: "{{ kubectl_version }}"
-    source_url: "https://dl.k8s.io/v{{ kubectl_version }}/kubernetes-client-linux-amd64.tar.gz"
-    bin_to_copy: "kubernetes/client/bin/kubectl"
-    bin_dir: /usr/bin/
-    to_remove: kubernetes
     check_bin_version_before_installing: true
+    source_url: "https://dl.k8s.io/{{ kubectl_version }}/bin/linux/amd64/kubectl"
+    bin_to_copy: "kubectl"
+    to_remove: "kubectl"
+    bin_dir: "/usr/local/bin"
+    version_cmd: " version --client"
+    target_version: "{{ kubectl_version }}"
   kind:
-    bin_name: "kind"
+    bin_name: kind
     bin_version: "{{ kind_version }}"
+    check_bin_version_before_installing: true
     source_url: "https://github.com/kubernetes-sigs/kind/releases/download/v{{ kind_version }}/kind-linux-amd64"
     bin_to_copy: kind-linux-amd64
-    bin_dir: /usr/bin/
-    to_remove: kind-linux-amd64
-    check_bin_version_before_installing: true
+    to_remove: ""
+    bin_dir: "/usr/bin/kind"
+    version_cmd: "version"
+    target_version: "{{ kind_version }}"
diff --git a/molecule/docker_test/converge.yml b/molecule/docker_test/converge.yml
new file mode 100644
index 0000000..94919c5
--- /dev/null
+++ b/molecule/docker_test/converge.yml
@@ -0,0 +1,11 @@
+---
+- hosts: all #"{{ target_host }}"
+  become: true
+
+  vars:
+    docker_install_compose: true
+    docker_version: '' # leave empty for latest version or set e.g. '=5:23.0.6-1~ubuntu.23.04~lunar'
+    install_kind: false
+
+  roles:
+    - install-configure-docker
diff --git a/molecule/docker_test/molecule.yml b/molecule/docker_test/molecule.yml
new file mode 100644
index 0000000..d007bd5
--- /dev/null
+++ b/molecule/docker_test/molecule.yml
@@ -0,0 +1,39 @@
+---
+role_name_check: 1
+dependency:
+  name: galaxy
+  options:
+    ignore-errors: true
+driver:
+  name: docker
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-rockylinux9}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
+
+verifier:
+  name: ansible
+
+scenario:
+  name: docker_test
+  test_sequence:
+    - destroy
+    - dependency
+    - syntax
+    - create
+    - prepare
+    - converge
+    #- idempotence
+    #- check
+    # - side_effect
+    # - verify
+    # - destroy