diff --git a/geant/gap_ansible/playbooks/l3_core_service.yaml b/geant/gap_ansible/playbooks/l3_core_service.yaml
index ae0166b0bff0af0d213d777f19bc376163238406..6517b5bcbfc7a981d364fa3f62140cc85b5dd7fb 100644
--- a/geant/gap_ansible/playbooks/l3_core_service.yaml
+++ b/geant/gap_ansible/playbooks/l3_core_service.yaml
@@ -23,7 +23,7 @@
     #   ansible.builtin.meta: end_play
 
     - name: Include storage path configuration
-      ansible.builtin.include_tasks: configure_storage.yaml
+      ansible.builtin.include_tasks: ../tasks/configure_storage.yaml
 
     - name: Import standard general variables for GEANT L3 Core Services
       ansible.builtin.include_vars:
diff --git a/geant/gap_ansible/playbooks/manage_bgp_peers.yaml b/geant/gap_ansible/playbooks/manage_bgp_peers.yaml
index b5d5aa16be9136b6dfdc3d0d55319a84acb77612..ed5898afc73eb549b98f0b233e32f54e55a13020 100644
--- a/geant/gap_ansible/playbooks/manage_bgp_peers.yaml
+++ b/geant/gap_ansible/playbooks/manage_bgp_peers.yaml
@@ -3,7 +3,7 @@
   gather_facts: false
   tasks:
     - name: Include storage path configuration
-      ansible.builtin.include_tasks: configure_storage.yaml
+      ansible.builtin.include_tasks: ../tasks/configure_storage.yaml
 
     - name: Import general variables for {{ partner_name | upper }}
       ansible.builtin.include_vars:
diff --git a/geant/gap_ansible/playbooks/manage_sbp.yaml b/geant/gap_ansible/playbooks/manage_sbp.yaml
index da45e51773273d5e6991e764968fd5382c62eaf9..7e1715b12cab9b60e73495f6474f184ef3b37783 100644
--- a/geant/gap_ansible/playbooks/manage_sbp.yaml
+++ b/geant/gap_ansible/playbooks/manage_sbp.yaml
@@ -3,7 +3,7 @@
   gather_facts: false
   tasks:
     - name: Include storage path configuration
-      ansible.builtin.include_tasks: configure_storage.yaml
+      ansible.builtin.include_tasks: ../tasks/configure_storage.yaml
 
     - name: Import standard general variables for GEANT L3 Core Services
       ansible.builtin.include_vars:
diff --git a/geant/gap_ansible/playbooks/validate_prefix_list.yaml b/geant/gap_ansible/playbooks/validate_prefix_list.yaml
index 833a8ffa808dd83bb8bece8b6769f7ec2f7d86a1..c868c8b6f4236ff452ca15d69cef6a490172e84b 100644
--- a/geant/gap_ansible/playbooks/validate_prefix_list.yaml
+++ b/geant/gap_ansible/playbooks/validate_prefix_list.yaml
@@ -4,7 +4,7 @@
   gather_facts: false
   tasks:
     - name: Include storage path configuration
-      ansible.builtin.include_tasks: configure_storage.yaml
+      ansible.builtin.include_tasks: ../tasks/configure_storage.yaml
 
     - name: Import standard general variables for GEANT L3 Core Services
       ansible.builtin.include_vars:
diff --git a/geant/gap_ansible/playbooks/vrf_update.yaml b/geant/gap_ansible/playbooks/vrf_update.yaml
index d8e33ef134e061fa5d785d5fbdb7e9b788d7442b..866241642cd82960e7572bcc7da5a0577abf5f5a 100644
--- a/geant/gap_ansible/playbooks/vrf_update.yaml
+++ b/geant/gap_ansible/playbooks/vrf_update.yaml
@@ -4,7 +4,7 @@
   gather_facts: false
   tasks:
     - name: Include storage path configuration
-      ansible.builtin.include_tasks: configure_storage.yaml
+      ansible.builtin.include_tasks: ../tasks/configure_storage.yaml
 
     - name: Import standard variables for "{{ subscription.product.product_type }}/{{ subscription.vrf.vrf_name | upper }}"
       ansible.builtin.include_vars:
diff --git a/geant/gap_ansible/roles/base_config/tasks/configure_storage.yaml b/geant/gap_ansible/roles/base_config/tasks/configure_storage.yaml
index 67d67dcb2717062e2e9158d3ed1da000bb66e932..0998fc94da841acab1668c1a80098f9f4e47bbb0 120000
--- a/geant/gap_ansible/roles/base_config/tasks/configure_storage.yaml
+++ b/geant/gap_ansible/roles/base_config/tasks/configure_storage.yaml
@@ -1 +1 @@
-../../../playbooks/configure_storage.yaml
\ No newline at end of file
+../../../tasks/configure_storage.yaml
\ No newline at end of file
diff --git a/geant/gap_ansible/roles/edge_port/tasks/configure_storage.yaml b/geant/gap_ansible/roles/edge_port/tasks/configure_storage.yaml
index 67d67dcb2717062e2e9158d3ed1da000bb66e932..0998fc94da841acab1668c1a80098f9f4e47bbb0 120000
--- a/geant/gap_ansible/roles/edge_port/tasks/configure_storage.yaml
+++ b/geant/gap_ansible/roles/edge_port/tasks/configure_storage.yaml
@@ -1 +1 @@
-../../../playbooks/configure_storage.yaml
\ No newline at end of file
+../../../tasks/configure_storage.yaml
\ No newline at end of file
diff --git a/geant/gap_ansible/roles/ibgp_update/tasks/configure_storage.yaml b/geant/gap_ansible/roles/ibgp_update/tasks/configure_storage.yaml
index 67d67dcb2717062e2e9158d3ed1da000bb66e932..0998fc94da841acab1668c1a80098f9f4e47bbb0 120000
--- a/geant/gap_ansible/roles/ibgp_update/tasks/configure_storage.yaml
+++ b/geant/gap_ansible/roles/ibgp_update/tasks/configure_storage.yaml
@@ -1 +1 @@
-../../../playbooks/configure_storage.yaml
\ No newline at end of file
+../../../tasks/configure_storage.yaml
\ No newline at end of file
diff --git a/geant/gap_ansible/roles/iptrunk/tasks/configure_storage.yaml b/geant/gap_ansible/roles/iptrunk/tasks/configure_storage.yaml
index 67d67dcb2717062e2e9158d3ed1da000bb66e932..0998fc94da841acab1668c1a80098f9f4e47bbb0 120000
--- a/geant/gap_ansible/roles/iptrunk/tasks/configure_storage.yaml
+++ b/geant/gap_ansible/roles/iptrunk/tasks/configure_storage.yaml
@@ -1 +1 @@
-../../../playbooks/configure_storage.yaml
\ No newline at end of file
+../../../tasks/configure_storage.yaml
\ No newline at end of file
diff --git a/geant/gap_ansible/roles/iptrunk_migration/tasks/configure_storage.yaml b/geant/gap_ansible/roles/iptrunk_migration/tasks/configure_storage.yaml
index 67d67dcb2717062e2e9158d3ed1da000bb66e932..0998fc94da841acab1668c1a80098f9f4e47bbb0 120000
--- a/geant/gap_ansible/roles/iptrunk_migration/tasks/configure_storage.yaml
+++ b/geant/gap_ansible/roles/iptrunk_migration/tasks/configure_storage.yaml
@@ -1 +1 @@
-../../../playbooks/configure_storage.yaml
\ No newline at end of file
+../../../tasks/configure_storage.yaml
\ No newline at end of file
diff --git a/geant/gap_ansible/roles/iptrunk_twamp/tasks/configure_storage.yaml b/geant/gap_ansible/roles/iptrunk_twamp/tasks/configure_storage.yaml
index 67d67dcb2717062e2e9158d3ed1da000bb66e932..0998fc94da841acab1668c1a80098f9f4e47bbb0 120000
--- a/geant/gap_ansible/roles/iptrunk_twamp/tasks/configure_storage.yaml
+++ b/geant/gap_ansible/roles/iptrunk_twamp/tasks/configure_storage.yaml
@@ -1 +1 @@
-../../../playbooks/configure_storage.yaml
\ No newline at end of file
+../../../tasks/configure_storage.yaml
\ No newline at end of file
diff --git a/geant/gap_ansible/roles/l2circuits/tasks/configure_storage.yaml b/geant/gap_ansible/roles/l2circuits/tasks/configure_storage.yaml
index 67d67dcb2717062e2e9158d3ed1da000bb66e932..0998fc94da841acab1668c1a80098f9f4e47bbb0 120000
--- a/geant/gap_ansible/roles/l2circuits/tasks/configure_storage.yaml
+++ b/geant/gap_ansible/roles/l2circuits/tasks/configure_storage.yaml
@@ -1 +1 @@
-../../../playbooks/configure_storage.yaml
\ No newline at end of file
+../../../tasks/configure_storage.yaml
\ No newline at end of file
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/configure_storage.yaml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/configure_storage.yaml
index 67d67dcb2717062e2e9158d3ed1da000bb66e932..0998fc94da841acab1668c1a80098f9f4e47bbb0 120000
--- a/geant/gap_ansible/roles/promote_p_to_pe/tasks/configure_storage.yaml
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/configure_storage.yaml
@@ -1 +1 @@
-../../../playbooks/configure_storage.yaml
\ No newline at end of file
+../../../tasks/configure_storage.yaml
\ No newline at end of file
diff --git a/geant/gap_ansible/roles/sdp/tasks/configure_storage.yaml b/geant/gap_ansible/roles/sdp/tasks/configure_storage.yaml
index 67d67dcb2717062e2e9158d3ed1da000bb66e932..0998fc94da841acab1668c1a80098f9f4e47bbb0 120000
--- a/geant/gap_ansible/roles/sdp/tasks/configure_storage.yaml
+++ b/geant/gap_ansible/roles/sdp/tasks/configure_storage.yaml
@@ -1 +1 @@
-../../../playbooks/configure_storage.yaml
\ No newline at end of file
+../../../tasks/configure_storage.yaml
\ No newline at end of file
diff --git a/geant/gap_ansible/playbooks/configure_storage.yaml b/geant/gap_ansible/tasks/configure_storage.yaml
similarity index 100%
rename from geant/gap_ansible/playbooks/configure_storage.yaml
rename to geant/gap_ansible/tasks/configure_storage.yaml