diff --git a/Ansible/roles/debian_server/tasks/btrfs.yml b/Ansible/roles/debian_server/tasks/btrfs.yml
index aac0ef61af73fa7f9a02e54361cdb100ad672126..cc7952bd65fc590099be08527e04d5ca7d1f8bf7 100644
--- a/Ansible/roles/debian_server/tasks/btrfs.yml
+++ b/Ansible/roles/debian_server/tasks/btrfs.yml
@@ -1,13 +1,4 @@
 ---
-- name: Find a mountpoint for {{ device }}
-  # There can be multiple once with bind mounts or subvolumes, we only need
-  # one.
-  set_fact:
-    # yamllint disable rule:line-length
-    btrfs_mountpoint: |-
-      {{ (ansible_facts.mounts|selectattr("device", "equalto", device)|first)["mount"] }}
-    # yamllint enable rule:line-length
-
 - name: Install btrfs packages
   apt:
     cache_valid_time: 3600
@@ -34,6 +25,10 @@
     src: btrfs_scrub.{{ item }}.j2
   vars: &vars
     name: '{{ device|replace("/", "_") }}'
+    # yamllint disable rule:line-length
+    mountpoint: |-
+      {{ (ansible_facts.mounts|selectattr("device", "equalto", device)|first)["mount"] }}
+    # yamllint enable rule:line-length
   tags: [scrub]
 
 - name: Enable btrfs scrub timers
diff --git a/Ansible/roles/debian_server/templates/btrfs_check.service.j2 b/Ansible/roles/debian_server/templates/btrfs_check.service.j2
index 232a084ad7fe05d50f0caf3a15ca0998eb59e8b4..d7199892a5ca08e1134cd307965d45be45bc689d 100644
--- a/Ansible/roles/debian_server/templates/btrfs_check.service.j2
+++ b/Ansible/roles/debian_server/templates/btrfs_check.service.j2
@@ -6,4 +6,4 @@ After=network-online.target
 
 [Service]
 Type=exec
-ExecStart=mnpw --warn -- /usr/lib/nagios-btrfs/plugins/check_btrfs --mountpoint {{ btrfs_mountpoint }}
+ExecStart=mnpw --warn -- /usr/lib/nagios-btrfs/plugins/check_btrfs --mountpoint {{ mountpoint }}