diff --git a/roles/docker/tasks/docker.yml b/roles/docker/tasks/docker.yml
new file mode 100644
index 0000000..3af2172
--- /dev/null
+++ b/roles/docker/tasks/docker.yml
@@ -0,0 +1,21 @@
+# vim: ft=yaml.ansible
+---
+- name: Copy Docker daemon config file
+  template:
+    src: daemon.json.j2
+    dest: /etc/docker/daemon.json
+    owner: root
+    mode: u=rw,g=r,o=r
+  register: daemon_config
+
+- name: (Disable and) start Docker daemon
+  service:
+    name: "{{ item }}"
+    enabled: false
+    state: "{{ 'restarted' if daemon_config.changed else 'started' }}"
+  loop:
+    - docker.socket
+    - docker.service
+
+- name: Set up Docker services
+  import_tasks: services.yml
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 12990c7..bed3152 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -37,8 +37,8 @@
       - docker
       - docker-compose
 
-- name: Set up Docker services
-  import_tasks: services.yml
+- name: Set up Docker
+  import_tasks: docker.yml
   tags:
     - reboot
     - services
diff --git a/roles/docker/tasks/services.yml b/roles/docker/tasks/services.yml
index be74cfe..0eb37c9 100644
--- a/roles/docker/tasks/services.yml
+++ b/roles/docker/tasks/services.yml
@@ -1,22 +1,5 @@
 # vim: ft=yaml.ansible
 ---
-- name: Copy Docker daemon config file
-  template:
-    src: daemon.json.j2
-    dest: /etc/docker/daemon.json
-    owner: root
-    mode: u=rw,g=r,o=r
-  register: daemon_config
-
-- name: (Disable and) start Docker daemon
-  service:
-    name: "{{ item }}"
-    enabled: false
-    state: "{{ 'restarted' if daemon_config.changed else 'started' }}"
-  loop:
-    - docker.socket
-    - docker.service
-
 - name: Create base directory for Docker volumes
   file:
     name: "{{ base_volume }}"
diff --git a/roles/os_config/tasks/base.yml b/roles/os_config/tasks/base.yml
index 22ef855..9ac0017 100644
--- a/roles/os_config/tasks/base.yml
+++ b/roles/os_config/tasks/base.yml
@@ -49,7 +49,7 @@
     filter:
       - ansible_mounts
       - ansible_swaptotal_mb
-  when: reboot.rebooted
+  when: not reboot.skipped and reboot.rebooted
 
 - name: Clone apt-update-push
   git: