diff --git a/templates/docker.service.d_Assertions.conf.j2 b/templates/docker.service.d_Assertions.conf.j2
index 598b70962b2af0277df6d149584ca9e4cc93e6b2..2d58df4cd04a1940e990faf7710664bfcfc1b59b 100644
--- a/templates/docker.service.d_Assertions.conf.j2
+++ b/templates/docker.service.d_Assertions.conf.j2
@@ -1,4 +1,4 @@
 [Unit]
-After=home-nimrod.mount
-AssertPathIsMountPoint={{ docker_graph_mount }}
+After=home-{{ ansible_env.SUDO_USER }}.mount
+AssertPathIsMountPoint={{  docker_graph_df.stdout_lines.1.split().5 }}
 AssertPathIsDirectory={{ docker_graph_directory }}
diff --git a/workstation.yml b/workstation.yml
index 3a774702a9a8ee9ec11fd032fc7e7df28e87383a..281e0bee436506d53d83b408287c314138ef91bc 100644
--- a/workstation.yml
+++ b/workstation.yml
@@ -3,8 +3,7 @@
   become: yes
   become_user: root
   vars:
-      docker_graph_mount: '/home/{{ ansible_env.SUDO_USER }}'
-      docker_graph_directory: '{{ docker_graph_mount }}/.bind_mounts/docker'
+      docker_graph_directory: '/home/{{ ansible_env.SUDO_USER }}/.bind_mounts/docker'
   handlers:
   - name: Systemd daemon reload
     command: /bin/systemctl daemon-reload
@@ -71,6 +70,11 @@
     notify:
     - Restart Docker
 
+  - name: Get Docker graph directory mountpoint
+    shell: df {{ docker_graph_directory }}
+    register: docker_graph_df
+    changed_when: False
+
   - name: Create Systemd configuration override directories
     with_items:
     - docker.service