diff --git a/bigboot_execute_resize.yml b/bigboot_execute_resize.yml
index 664ac97..87edf51 100644
--- a/bigboot_execute_resize.yml
+++ b/bigboot_execute_resize.yml
@@ -74,17 +74,6 @@
       when:
         - bigboot_data[inventory_hostname]['bigboot_execute_bigboot'] | bool
 
-    - name: Get the list of services on the host
-      ansible.builtin.service_facts:
-
-    - name: Re-enabling Docker service
-      ansible.builtin.service:
-        name: docker.service
-        state: started
-        enabled: true
-      when:
-        - "'docker.service' in ansible_facts['services']"
-
     - name: Re-enabling services previously disabled
       ansible.builtin.service:
         name: "{{ item }}"
diff --git a/bigboot_setup_environment.yml b/bigboot_setup_environment.yml
index 1bb86b6..8539e65 100644
--- a/bigboot_setup_environment.yml
+++ b/bigboot_setup_environment.yml
@@ -12,21 +12,21 @@
     - name: Cleanup from any previous executions
       ansible.builtin.import_tasks: tasks/cleanup.yml
 
-    - name: Get the list of services on the host
+    - name: Ensure service facts are available
       ansible.builtin.service_facts:
 
     - name: Stop Docker service due to incompatibility
       ansible.builtin.service:
-        name: docker.service
+        name: "{{ bigboot_docker_service }}"
         state: stopped
       when:
         - ansible_facts['services'][bigboot_docker_service] is defined
         - ansible_facts['services'][bigboot_docker_service]['state'] == "running"
 
-    - name: Capture boot device details
+    - name: Set boot device details
       ansible.builtin.import_tasks: tasks/capture_boot_device_details.yml
 
-    - name: Capture logical volume information
+    - name: Set logical volume information
       ansible.builtin.import_tasks: tasks/capture_lv_device_details.yml
 
     - name: Set environment for subsequent workflow nodes