diff --git a/ansible/roles/win_transfer/tasks/main.yml b/ansible/roles/win_transfer/tasks/main.yml
index b8f67fb..7ad2cc6 100644
--- a/ansible/roles/win_transfer/tasks/main.yml
+++ b/ansible/roles/win_transfer/tasks/main.yml
@@ -1,3 +1,2 @@
 ---
-- import_tasks: mount.yml
-- import_tasks: teardown.yml
+- import_tasks: "{{ mount_action | default('mount') }}.yml"
diff --git a/ansible/roles/win_transfer/tasks/teardown.yml b/ansible/roles/win_transfer/tasks/unmount.yml
similarity index 93%
rename from ansible/roles/win_transfer/tasks/teardown.yml
rename to ansible/roles/win_transfer/tasks/unmount.yml
index a457ff0..70c6e57 100644
--- a/ansible/roles/win_transfer/tasks/teardown.yml
+++ b/ansible/roles/win_transfer/tasks/unmount.yml
@@ -1,8 +1,6 @@
 ---
 - name: Unmount Filesystem
-  tags: 
-    - teardown
-    - never
+  tags: teardown
   block:
     - name: Unmount filesystem on os-transfer
       ansible.posix.mount: