diff --git a/geant/gap_ansible/roles/base_config/tasks/compile_base_config.yaml b/geant/gap_ansible/roles/base_config/tasks/compile_base_config.yaml
index 96a5b4e286c4f8d335daa7cf97d661c3ba808b18..a0531622d692b9b77b225d168ba9def39d95f227 100644
--- a/geant/gap_ansible/roles/base_config/tasks/compile_base_config.yaml
+++ b/geant/gap_ansible/roles/base_config/tasks/compile_base_config.yaml
@@ -18,15 +18,15 @@
 
 - name: Create a folder for all the things
   ansible.builtin.file:
-    path: "/var/tmp/ansible_run_{{ opid }}"
+    path: "{{ play_storage_path }}"
     state: directory
     mode: '0755'
   delegate_to: localhost
 
-- name: Print the template in "/var/tmp/ansible_run_{{ opid }}/base_config.conf"
+- name: Print the template in "{{ play_storage_path }}/base_config.conf"
   ansible.builtin.template:
     src: "routers/{{ wfo_router.router.vendor }}/base_config.j2"
-    dest: "/var/tmp/ansible_run_{{ opid }}/base_config.conf"
+    dest: "{{ play_storage_path }}/base_config.conf"
     lstrip_blocks: true
     trim_blocks: true
     mode: '0755'
diff --git a/geant/gap_ansible/roles/base_config/tasks/configure_storage.yaml b/geant/gap_ansible/roles/base_config/tasks/configure_storage.yaml
new file mode 120000
index 0000000000000000000000000000000000000000..67d67dcb2717062e2e9158d3ed1da000bb66e932
--- /dev/null
+++ b/geant/gap_ansible/roles/base_config/tasks/configure_storage.yaml
@@ -0,0 +1 @@
+../../../playbooks/configure_storage.yaml
\ No newline at end of file
diff --git a/geant/gap_ansible/roles/base_config/tasks/deploy_base_config.yaml b/geant/gap_ansible/roles/base_config/tasks/deploy_base_config.yaml
index c29a2a046af6678c16730bacd02dd4fd7ed4c617..83d8ab63ac67b7c338bfc93cc1ba6bf2216bd441 100644
--- a/geant/gap_ansible/roles/base_config/tasks/deploy_base_config.yaml
+++ b/geant/gap_ansible/roles/base_config/tasks/deploy_base_config.yaml
@@ -1,7 +1,7 @@
 - name: Deploy base_config on "{{ inventory_hostname }}" [CHECK ONLY][Juniper]
   junipernetworks.junos.junos_config:
     update: 'replace'
-    src: "/var/tmp/ansible_run_{{ opid }}/{{ mytemplates.template_name }}.conf"
+    src: "{{ play_storage_path }}/{{ mytemplates.template_name }}.conf"
     src_format: text
     check_commit: true
   diff: true
@@ -17,7 +17,7 @@
 - name: Deploy base_config on "{{ inventory_hostname }}" [AND COMMIT][Juniper]
   junipernetworks.junos.junos_config:
     update: 'replace'
-    src: "/var/tmp/ansible_run_{{ opid }}/{{ mytemplates.template_name }}.conf"
+    src: "{{ play_storage_path }}/{{ mytemplates.template_name }}.conf"
     src_format: text
     comment: "{{ commit_comment }}"
   diff: true
diff --git a/geant/gap_ansible/roles/base_config/tasks/main.yml b/geant/gap_ansible/roles/base_config/tasks/main.yml
index 0a6fb446324230b694c9fcd4c9936cab80ca1b7f..a0f793aee732718e2db835d09107aab93b632533 100644
--- a/geant/gap_ansible/roles/base_config/tasks/main.yml
+++ b/geant/gap_ansible/roles/base_config/tasks/main.yml
@@ -39,17 +39,8 @@
   when:
     wfo_router.router.vendor == "juniper"
 
-
-- name: Generate an ID for this run
-  ansible.builtin.set_fact:
-    opid: "{{ lookup('community.general.random_string', length=18, special=false) }}"
-    config_is_different: "False"
-
-
-- name: Print the ID
-  ansible.builtin.debug:
-    msg: "{{ opid }}"
-
+- name: Include configure storage tasks
+  ansible.builtin.include_tasks: configure_storage.yaml
 
 - name: Merge the variables
   when: verb in verbs