diff --git a/galaxy.yml b/galaxy.yml
index 24e2677..f0d4a5d 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -8,6 +8,6 @@ readme: README.md
 repository: https://git.uumas.fi/uumas/ansible-docker
 license_file: LICENSE
 dependencies:
-  uumas.general: '>=0.5.8'
+  uumas.general: '>=0.5.9'
 authors:
   - uumas
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 52c5df7..d23b569 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,33 +1,15 @@
 ---
 
-- name: Install dependencies
-  apt:
-    name:
-      - apt-transport-https
-      - ca-certificates
-      - curl
-      - gnupg
-      - lsb-release
-    update_cache: true
-
-- name: Set dpkg arch (amd64)
-  set_fact:
-    dpkg_arch: amd64
-  when: ansible_architecture == 'x86_64'
-- name: Set dpkg arch (arm64)
-  set_fact:
-    dpkg_arch: arm64
-  when: ansible_architecture == 'aarch64'
-
-- name: Add docker repo signing key
-  apt_key:
-    id: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
-    url: 'https://download.docker.com/linux/debian/gpg'
-- name: Add docker repo
-  apt_repository:
-    repo: "deb [arch={{ dpkg_arch }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable"
-    filename: 'docker'
-    mode: '644'
+- name: Add docker apt repository
+  ansible.builtin.import_role:
+    name: uumas.general.apt_repository
+  vars:
+    repo_name: docker
+    repo_url: https://download.docker.com/linux/{{ ansible_distribution | lower }}
+    repo_key_url: https://download.docker.com/linux/debian/gpg
+    repo_arch: "{{ apt_arch }}"
+    repo_components:
+      - stable
 
 - name: Install docker
   apt:
@@ -36,3 +18,9 @@
       - docker-ce-cli
       - containerd.io
       - python3-docker
+
+- name: Ensure docker is started and enabled
+  ansible.builtin.systemd:
+    name: docker.service
+    state: started
+    enabled: true