diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
index 5030e85..e956fc0 100644
--- a/roles/docker/handlers/main.yml
+++ b/roles/docker/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: restart docker
-  systemd:
+- name: Restart docker
+  ansible.builtin.systemd:
     name: docker.service
     state: restarted
diff --git a/roles/docker/molecule/default/converge.yml b/roles/docker/molecule/default/converge.yml
new file mode 100644
index 0000000..cba3189
--- /dev/null
+++ b/roles/docker/molecule/default/converge.yml
@@ -0,0 +1,5 @@
+---
+- name: Converge
+  hosts: all
+  roles:
+    - docker
diff --git a/roles/docker/molecule/default/molecule.yml b/roles/docker/molecule/default/molecule.yml
new file mode 100644
index 0000000..586e4e8
--- /dev/null
+++ b/roles/docker/molecule/default/molecule.yml
@@ -0,0 +1,15 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: podman
+platforms:
+  - name: bullseye
+    image: git.uumas.fi/uumas/molecule-testbed:bullseye
+    command: /lib/systemd/systemd
+    pre_build_image: true
+    privileged: true
+provisioner:
+  name: ansible
+verifier:
+  name: ansible
diff --git a/roles/docker/molecule/default/verify.yml b/roles/docker/molecule/default/verify.yml
new file mode 100644
index 0000000..2df2ec4
--- /dev/null
+++ b/roles/docker/molecule/default/verify.yml
@@ -0,0 +1,14 @@
+---
+# This is an example playbook to execute Ansible tests.
+
+- name: Verify
+  hosts: all
+  gather_facts: false
+  tasks:
+    - name: Docker hello world container
+      community.docker.docker_container:
+        name: hello-world
+        image: hello-world
+        detach: false
+        cleanup: true
+      register: docker_hello_world
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index d23b569..2b0b3f9 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -12,7 +12,7 @@
       - stable
 
 - name: Install docker
-  apt:
+  ansible.builtin.apt:
     name:
       - docker-ce
       - docker-ce-cli