diff --git a/roles/aws_efs_config/tasks/main.yml b/roles/aws_efs_config/tasks/main.yml
index 79ac1da..ae1933f 100644
--- a/roles/aws_efs_config/tasks/main.yml
+++ b/roles/aws_efs_config/tasks/main.yml
@@ -1,5 +1,12 @@
 ---
 
+- name: Create mountpoint
+  file:
+    state: directory
+    path: "{{ atl_shared_mountpoint }}"
+    owner: "{{ product_user }}"
+    mode: 0755
+
 - name: Enable mountpoint in fstab
   mount:
     path: "{{ atl_shared_mountpoint }}"
diff --git a/roles/product_base/tasks/main.yml b/roles/product_base/tasks/main.yml
index d176d42..4758609 100644
--- a/roles/product_base/tasks/main.yml
+++ b/roles/product_base/tasks/main.yml
@@ -4,10 +4,3 @@
   user:
     name: "{{ product_user }}"
     comment: "Product runtime user"
-
-- name: Create mountpoint
-  file:
-    state: directory
-    path: "{{ atl_shared_mountpoint }}"
-    owner: "{{ product_user }}"
-    mode: 0755