diff --git a/create-infra.yml b/create-infra.yml
index 1328faf6d4..904fc53b3c 100644
--- a/create-infra.yml
+++ b/create-infra.yml
@@ -151,7 +151,7 @@
 
         - name: Set permissions on ci-framework-data folder on controller-0
           ansible.builtin.file:
-            path: "{{ cifmw_basedir | default(ansible_user_dir + '/ci-framework-data') }}"
+            path: "{{ cifmw_basedir }}"
             state: directory
             recurse: true
             owner: "{{ ansible_user_id }}"
diff --git a/group_vars/all.yml b/group_vars/all.yml
index d83e8b5c46..4de233a41c 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -1,6 +1,6 @@
 ---
 # This file contains all repeating variables, that can be set
-# globaly instead of parse Zuul inventory file to get proper value.
+# globally instead of parse Zuul inventory file to get proper value.
 #### GLOBAL VARS ####
 ansible_user_dir: "{{ lookup('env', 'HOME') }}"
 cifmw_project_dir: src/github.com/openstack-k8s-operators/ci-framework
@@ -10,9 +10,9 @@ cifmw_installyamls_repos_relative: src/github.com/openstack-k8s-operators/instal
 cifmw_installyamls_repos: "{{ ansible_user_dir }}/{{ cifmw_installyamls_repos_relative }}"
 cifmw_architecture_repo_relative: src/github.com/openstack-k8s-operators/architecture
 cifmw_architecture_repo: "{{ ansible_user_dir }}/{{ cifmw_architecture_repo_relative }}"
-
 cifmw_openstack_namespace: "{{ cifmw_install_yamls_defaults['NAMESPACE'] | default('openstack') }}"
 operator_namespace: "{{ cifmw_install_yamls_defaults['OPERATOR_NAMESPACE'] | default('openstack-operators') }}"
+cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
 
 # Default DNS servers to use across the framework
 cifmw_default_dns_servers:
diff --git a/playbooks/01-bootstrap.yml b/playbooks/01-bootstrap.yml
index 912aefd9a2..7669b6053d 100644
--- a/playbooks/01-bootstrap.yml
+++ b/playbooks/01-bootstrap.yml
@@ -71,5 +71,5 @@
         - always
       ansible.builtin.copy:
         mode: "0644"
-        dest: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/custom-params.yml"
+        dest: "{{ cifmw_basedir }}/artifacts/parameters/custom-params.yml"
         content: "{{ ci_framework_params | to_nice_yaml }}"
diff --git a/playbooks/99-logs.yml b/playbooks/99-logs.yml
index 54bbe6d57b..c4e3c9339a 100644
--- a/playbooks/99-logs.yml
+++ b/playbooks/99-logs.yml
@@ -44,7 +44,7 @@
         logfiles_dest_dir: >-
           {{
             (
-              cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data'),
+              cifmw_basedir,
               'logs/',
               now(fmt='%Y-%m-%d_%H-%M')
             ) | path_join
@@ -104,7 +104,7 @@
             dest: >-
               {{
                 (
-                  cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data'),
+                  cifmw_basedir,
                   "artifacts/ansible_facts." + now(fmt='%Y-%m-%d_%H-%M')
                 ) | path_join
               }}
diff --git a/plugins/modules/generate_make_tasks.py b/plugins/modules/generate_make_tasks.py
index 3d538ecb31..810f01acf5 100644
--- a/plugins/modules/generate_make_tasks.py
+++ b/plugins/modules/generate_make_tasks.py
@@ -74,7 +74,7 @@
   until: "{{ make_%(target)s_until | default(true) }}"
   register: "make_%(target)s_status"
   cifmw.general.ci_script:
-    output_dir: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts"
+    output_dir: "{{ cifmw_basedir }}/artifacts"
     chdir: "%(chdir)s"
     script: "make %(target)s"
     dry_run: "{{ make_%(target)s_dryrun|default(false)|bool }}"
diff --git a/roles/artifacts/defaults/main.yml b/roles/artifacts/defaults/main.yml
index eabd9427a6..788219c653 100644
--- a/roles/artifacts/defaults/main.yml
+++ b/roles/artifacts/defaults/main.yml
@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_artifacts"
-cifmw_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_artifacts_basedir: "{{ cifmw_basedir }}"
 cifmw_artifacts_crc_host: "api.crc.testing"
 cifmw_artifacts_crc_user: "core"
 cifmw_artifacts_crc_sshkey: "~/.crc/machines/crc/id_ecdsa"
diff --git a/roles/build_containers/defaults/main.yml b/roles/build_containers/defaults/main.yml
index 9d8bc9c185..44db6c4b05 100644
--- a/roles/build_containers/defaults/main.yml
+++ b/roles/build_containers/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_build_containers"
 cifmw_build_containers_tcib_src: "https://github.com/openstack-k8s-operators/tcib"
-cifmw_build_containers_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_build_containers_basedir: "{{ cifmw_basedir }}"
 cifmw_build_containers_authfile_path: ${XDG_RUNTIME_DIR}/containers/auth.json
 cifmw_build_containers_push_containers: false
 cifmw_build_containers_timestamper_cmd: >-
diff --git a/roles/build_containers/molecule/default/prepare.yml b/roles/build_containers/molecule/default/prepare.yml
index 4b92070430..92ccae0a3e 100644
--- a/roles/build_containers/molecule/default/prepare.yml
+++ b/roles/build_containers/molecule/default/prepare.yml
@@ -17,8 +17,6 @@
 
 - name: Prepare
   hosts: all
-  vars:
-    cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data/"
   roles:
     - role: test_deps
     - role: repo_setup
diff --git a/roles/build_openstack_packages/defaults/main.yml b/roles/build_openstack_packages/defaults/main.yml
index 549c7c4967..0825f323ba 100644
--- a/roles/build_openstack_packages/defaults/main.yml
+++ b/roles/build_openstack_packages/defaults/main.yml
@@ -31,7 +31,7 @@ cifmw_bop_dlrn_deps:
   - sqlite
   - python3-libselinux
 
-cifmw_bop_build_repo_dir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/logs"
+cifmw_bop_build_repo_dir: "{{ cifmw_basedir }}/logs"
 cifmw_bop_artifacts_basedir: "{{ ansible_user_dir ~ '/ci-framework-data' }}"
 cifmw_bop_dlrn_repo_url: "https://github.com/openstack-packages/DLRN.git"
 cifmw_bop_dlrn_from_source: false
diff --git a/roles/cert_manager/defaults/main.yml b/roles/cert_manager/defaults/main.yml
index e018fec6c5..f2e9fa590c 100644
--- a/roles/cert_manager/defaults/main.yml
+++ b/roles/cert_manager/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_cert_manager"
 
-cifmw_cert_manager_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_cert_manager_basedir: "{{ cifmw_basedir }}"
 cifmw_cert_manager_manifests_dir: "{{ cifmw_manifests | default(cifmw_cert_manager_basedir ~ '/artifacts/manifests') }}/cert-manager"
 cifmw_cert_manager_operator_namespace: cert-manager-operator
 cifmw_cert_manager_openshift_version: stable-v1
diff --git a/roles/ci_gen_kustomize_values/defaults/main.yml b/roles/ci_gen_kustomize_values/defaults/main.yml
index 25b81fc785..32596fbdd2 100644
--- a/roles/ci_gen_kustomize_values/defaults/main.yml
+++ b/roles/ci_gen_kustomize_values/defaults/main.yml
@@ -17,10 +17,7 @@
 # Top-level parameter shared with deploy_kustomize role
 cifmw_architecture_scenario: null
 
-cifmw_ci_gen_kustomize_values_basedir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_ci_gen_kustomize_values_basedir: "{{ cifmw_basedir }}"
 
 cifmw_ci_gen_kustomize_values_architecture_repo: >-
   {{
diff --git a/roles/ci_local_storage/defaults/main.yml b/roles/ci_local_storage/defaults/main.yml
index 8fc01b1886..c10e036e3e 100644
--- a/roles/ci_local_storage/defaults/main.yml
+++ b/roles/ci_local_storage/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_cls"
 
-cifmw_cls_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_cls_basedir: "{{ cifmw_basedir }}"
 cifmw_cls_manifests_dir: "{{ cifmw_manifests | default(cifmw_cls_basedir ~ '/artifacts/manifests') }}/storage"
 cifmw_cls_storage_class: local-storage
 cifmw_cls_storage_capacity: 10Gi
diff --git a/roles/ci_lvms_storage/defaults/main.yml b/roles/ci_lvms_storage/defaults/main.yml
index bf7cd3e71f..40c48ec094 100644
--- a/roles/ci_lvms_storage/defaults/main.yml
+++ b/roles/ci_lvms_storage/defaults/main.yml
@@ -20,7 +20,7 @@
 cifmw_lvms_disk_list: []
 cifmw_lvms_cluster_name: lvmcluster
 cifmw_lvms_namespace: openshift-lvm-storage
-cifmw_lvms_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_lvms_basedir: "{{ cifmw_basedir }}"
 cifmw_lvms_manifests_dir: "{{ cifmw_manifests | default(cifmw_lvms_basedir ~ '/artifacts/manifests') }}/lvms"
 # The "lvms-" prefix is prepended to the cifmw_lvms_storage_class by the lvm-operator
 cifmw_lvms_storage_class: local-storage
diff --git a/roles/ci_multus/defaults/main.yml b/roles/ci_multus/defaults/main.yml
index 31a96ce913..3652ccd89f 100644
--- a/roles/ci_multus/defaults/main.yml
+++ b/roles/ci_multus/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_ci_multus"
 
-cifmw_ci_multus_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_ci_multus_basedir: "{{ cifmw_basedir }}"
 cifmw_ci_multus_manifests_dir: "{{ cifmw_manifests | default(cifmw_ci_multus_basedir ~ '/artifacts/manifests') }}/ci_multus"
 cifmw_ci_multus_namespace: "openstack"
 cifmw_ci_multus_ocp_hostname: "crc"
diff --git a/roles/ci_nmstate/defaults/main.yml b/roles/ci_nmstate/defaults/main.yml
index 39cbcdf5e0..7aa61603d7 100644
--- a/roles/ci_nmstate/defaults/main.yml
+++ b/roles/ci_nmstate/defaults/main.yml
@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_ci_nmstate"
-cifmw_ci_nmstate_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_ci_nmstate_basedir: "{{ cifmw_basedir }}"
 cifmw_ci_nmstate_manifests_dir: "{{ cifmw_manifests | default(cifmw_ci_nmstate_basedir ~ '/artifacts/manifests') }}/nmstate"
 cifmw_ci_nmstate_configs_dir: "{{ cifmw_ci_nmstate_basedir }}/artifacts/nmstate"
 cifmw_ci_nmstate_namespace: openshift-nmstate
diff --git a/roles/ci_setup/defaults/main.yml b/roles/ci_setup/defaults/main.yml
index 7c3d21f24a..5122bbd22c 100644
--- a/roles/ci_setup/defaults/main.yml
+++ b/roles/ci_setup/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_ci_setup"
 
-cifmw_ci_setup_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_ci_setup_basedir: "{{ cifmw_basedir }}"
 cifmw_ci_setup_openshift_client_version: "stable"
 cifmw_ci_setup_oc_install_path: "{{ ansible_user_dir ~ '/bin' }}"
 cifmw_ci_setup_epel_pkgs: []
diff --git a/roles/cifmw_cephadm/defaults/main.yml b/roles/cifmw_cephadm/defaults/main.yml
index c407da07a3..abae1f794b 100644
--- a/roles/cifmw_cephadm/defaults/main.yml
+++ b/roles/cifmw_cephadm/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # defaults file for cifmw_cephadm
-cifmw_cephadm_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_cephadm_basedir: "{{ cifmw_basedir }}"
 cifmw_cephadm_spec_on_bootstrap: false  # not recommended due to https://tracker.ceph.com/issues/49277
 cifmw_cephadm_ssh_user: ceph-admin
 cifmw_cephadm_bin: /usr/sbin/cephadm
diff --git a/roles/cifmw_external_dns/defaults/main.yml b/roles/cifmw_external_dns/defaults/main.yml
index 25a40d8ca8..fd961117b6 100644
--- a/roles/cifmw_external_dns/defaults/main.yml
+++ b/roles/cifmw_external_dns/defaults/main.yml
@@ -23,7 +23,7 @@ cifmw_external_dns_check_mode: false
 cifmw_external_dns_certificate_dir: /etc/pki/tls/
 cifmw_external_dns_certificate: "{{ cifmw_external_dns_certificate_dir ~ cifmw_external_dns_domain }}.crt"
 cifmw_external_dns_key: "{{ cifmw_external_dns_certificate_dir ~ cifmw_external_dns_domain }}.key"
-cifmw_external_dns_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_external_dns_basedir: "{{ cifmw_basedir }}"
 cifmw_external_dns_manifests_dir: "{{ cifmw_manifests | default(cifmw_external_dns_basedir ~ '/artifacts/manifests') }}/cifmw_external_dns"
 # Important: use the same rootca-public as openstack
 cifmw_external_dns_cert_issuer_ref:
diff --git a/roles/cifmw_setup/tasks/bootstrap.yml b/roles/cifmw_setup/tasks/bootstrap.yml
index 0f92eb2b5e..87ac0cd4b7 100644
--- a/roles/cifmw_setup/tasks/bootstrap.yml
+++ b/roles/cifmw_setup/tasks/bootstrap.yml
@@ -63,5 +63,5 @@
     - always
   ansible.builtin.copy:
     mode: "0644"
-    dest: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/custom-params.yml"
+    dest: "{{ cifmw_basedir }}/artifacts/parameters/custom-params.yml"
     content: "{{ ci_framework_params | to_nice_yaml }}"
diff --git a/roles/cifmw_setup/tasks/run_logs.yml b/roles/cifmw_setup/tasks/run_logs.yml
index 895fc6a1de..0329d2daca 100644
--- a/roles/cifmw_setup/tasks/run_logs.yml
+++ b/roles/cifmw_setup/tasks/run_logs.yml
@@ -38,7 +38,7 @@
     logfiles_dest_dir: >-
       {{
         (
-          cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data'),
+          cifmw_basedir,
           'logs/',
           now(fmt='%Y-%m-%d_%H-%M')
         ) | path_join
@@ -97,7 +97,7 @@
         dest: >-
           {{
             (
-              cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data'),
+              cifmw_basedir,
               "artifacts/ansible_facts." + now(fmt='%Y-%m-%d_%H-%M')
             ) | path_join
           }}
diff --git a/roles/compliance/defaults/main.yml b/roles/compliance/defaults/main.yml
index 8cd30b1971..904b271ed6 100644
--- a/roles/compliance/defaults/main.yml
+++ b/roles/compliance/defaults/main.yml
@@ -17,7 +17,7 @@
 
 # defaults file for compliance role
 
-cifmw_compliance_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/tests/compliance"
+cifmw_compliance_artifacts_basedir: "{{ cifmw_basedir }}/tests/compliance"
 cifmw_compliance_cleanup: true
 
 # A list of available profiles can be found using "oscap info /usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml"
diff --git a/roles/config_drive/defaults/main.yml b/roles/config_drive/defaults/main.yml
index 146f9f27df..869fd9bf7a 100644
--- a/roles/config_drive/defaults/main.yml
+++ b/roles/config_drive/defaults/main.yml
@@ -17,10 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_config_drive"
-cifmw_config_drive_basedir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_config_drive_basedir: "{{ cifmw_basedir }}"
 cifmw_config_drive_workdir: >-
   {{ cifmw_config_drive_basedir }}/artifacts/cifmw_config_drive
 
diff --git a/roles/copy_container/defaults/main.yml b/roles/copy_container/defaults/main.yml
index 2d4e32fe16..fe008b77ad 100644
--- a/roles/copy_container/defaults/main.yml
+++ b/roles/copy_container/defaults/main.yml
@@ -6,4 +6,4 @@ enable_cron_c9: true
 # NEW names for conventions
 cifmw_copy_ct_enable_cron: "{{ enable_cron }}"
 cifmw_copy_ct_enable_cron_c9: "{{ enable_cron_c9 }}"
-cifmw_copy_ct_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_copy_ct_basedir: "{{ cifmw_basedir }}"
diff --git a/roles/dlrn_promote/defaults/main.yml b/roles/dlrn_promote/defaults/main.yml
index 344466ee3c..a3006364c2 100644
--- a/roles/dlrn_promote/defaults/main.yml
+++ b/roles/dlrn_promote/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_dlrn_report"
 
-cifmw_dlrn_promote_workspace: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_dlrn_promote_workspace: "{{ cifmw_basedir }}"
 cifmw_dlrn_promote_dlrnapi_user: "{{ dlrnapi_user | default('review_rdoproject_org') }}"
 cifmw_dlrn_promote_kerberos_auth: false
 cifmw_dlrn_promote_dlrnapi_host_principal: ""
diff --git a/roles/dlrn_report/defaults/main.yml b/roles/dlrn_report/defaults/main.yml
index 2fb646d9f4..5f35fa9f1b 100644
--- a/roles/dlrn_report/defaults/main.yml
+++ b/roles/dlrn_report/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_dlrn_report"
 
-cifmw_dlrn_report_workspace: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_dlrn_report_workspace: "{{ cifmw_basedir }}"
 cifmw_dlrn_report_dlrnapi_user: "{{ dlrnapi_user | default('review_rdoproject_org') }}"
 cifmw_dlrn_report_kerberos_auth: false
 cifmw_dlrn_report_result: true
diff --git a/roles/edpm_build_images/defaults/main.yml b/roles/edpm_build_images/defaults/main.yml
index 1bd06be2fe..87d158c6f2 100644
--- a/roles/edpm_build_images/defaults/main.yml
+++ b/roles/edpm_build_images/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_edpm_build_images"
 
-cifmw_edpm_build_images_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_edpm_build_images_basedir: "{{ cifmw_basedir }}"
 cifmw_edpm_build_images_via_rpm: true
 cifmw_edpm_build_images_host_packages:
   - diskimage-builder
diff --git a/roles/edpm_deploy/defaults/main.yml b/roles/edpm_deploy/defaults/main.yml
index fb85daf66c..e42f6449a6 100644
--- a/roles/edpm_deploy/defaults/main.yml
+++ b/roles/edpm_deploy/defaults/main.yml
@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_edpm_deploy"
-cifmw_edpm_deploy_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_edpm_deploy_basedir: "{{ cifmw_basedir }}"
 cifmw_edpm_deploy_manifests_dir: "{{ cifmw_manifests | default(cifmw_edpm_deploy_basedir ~ '/artifacts/manifests') }}"
 cifmw_edpm_deploy_retries: 100
 cifmw_edpm_deploy_run_validation: false
diff --git a/roles/edpm_deploy_baremetal/defaults/main.yml b/roles/edpm_deploy_baremetal/defaults/main.yml
index 58d519d999..dbe101c6ce 100644
--- a/roles/edpm_deploy_baremetal/defaults/main.yml
+++ b/roles/edpm_deploy_baremetal/defaults/main.yml
@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_edpm_deploy_baremetal"
-cifmw_edpm_deploy_baremetal_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_edpm_deploy_baremetal_basedir: "{{ cifmw_basedir }}"
 cifmw_edpm_deploy_baremetal_manifests_dir: "{{ cifmw_manifests | default(cifmw_edpm_deploy_baremetal_basedir ~ '/artifacts/manifests') }}"
 cifmw_edpm_deploy_baremetal_dry_run: false
 cifmw_edpm_deploy_baremetal_wait_provisionserver_retries: 60
diff --git a/roles/edpm_kustomize/defaults/main.yml b/roles/edpm_kustomize/defaults/main.yml
index 96db513660..45480091c3 100644
--- a/roles/edpm_kustomize/defaults/main.yml
+++ b/roles/edpm_kustomize/defaults/main.yml
@@ -17,5 +17,5 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_edpm_kustomize"
-cifmw_edpm_kustomize_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_edpm_kustomize_basedir: "{{ cifmw_basedir }}"
 cifmw_edpm_kustomize_artifacts_dir: "{{ cifmw_edpm_kustomize_basedir ~ '/artifacts' }}"
diff --git a/roles/edpm_prepare/defaults/main.yml b/roles/edpm_prepare/defaults/main.yml
index 814cecf5dc..f50d77a24f 100644
--- a/roles/edpm_prepare/defaults/main.yml
+++ b/roles/edpm_prepare/defaults/main.yml
@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_edpm_prepare"
-cifmw_edpm_prepare_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_edpm_prepare_basedir: "{{ cifmw_basedir }}"
 cifmw_edpm_prepare_manifests_dir: "{{ cifmw_manifests | default(cifmw_edpm_prepare_basedir ~ '/artifacts/manifests') }}"
 cifmw_edpm_prepare_oc_retries: 30
 cifmw_edpm_prepare_oc_delay: 30
diff --git a/roles/env_op_images/defaults/main.yml b/roles/env_op_images/defaults/main.yml
index 1a6d053662..9cfa89074c 100644
--- a/roles/env_op_images/defaults/main.yml
+++ b/roles/env_op_images/defaults/main.yml
@@ -18,6 +18,6 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_env_op_images"
 
-cifmw_env_op_images_dir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_env_op_images_dir: "{{ cifmw_basedir }}"
 cifmw_env_op_images_file: operator_images.yaml
 cifmw_env_op_images_dryrun: false
diff --git a/roles/env_op_images/molecule/default/converge.yml b/roles/env_op_images/molecule/default/converge.yml
index effc45a959..edb89515eb 100644
--- a/roles/env_op_images/molecule/default/converge.yml
+++ b/roles/env_op_images/molecule/default/converge.yml
@@ -20,7 +20,7 @@
   vars:
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
     cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig"
-    cifmw_env_op_images_dir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+    cifmw_env_op_images_dir: "{{ cifmw_basedir }}"
     cifmw_env_op_images_file: operator_images.yaml
     cifmw_env_op_images_dryrun: true
     cifmw_install_yamls_environment:
diff --git a/roles/hci_prepare/defaults/main.yml b/roles/hci_prepare/defaults/main.yml
index 7549fb849e..2b130fdc47 100644
--- a/roles/hci_prepare/defaults/main.yml
+++ b/roles/hci_prepare/defaults/main.yml
@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-cifmw_hci_prepare_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_hci_prepare_basedir: "{{ cifmw_basedir }}"
 cifmw_hci_prepare_dataplane_dir: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/dataplane"
 cifmw_hci_prepare_dryrun: false
 cifmw_hci_prepare_skip_load_parameters: false
diff --git a/roles/hive/defaults/main.yml b/roles/hive/defaults/main.yml
index 79cef2f05b..ca05c76d11 100644
--- a/roles/hive/defaults/main.yml
+++ b/roles/hive/defaults/main.yml
@@ -20,7 +20,7 @@
 
 cifmw_hive_dry_run: false
 
-cifmw_hive_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_hive_basedir: "{{ cifmw_basedir }}"
 cifmw_hive_artifacts_dir: "{{ cifmw_hive_basedir }}/artifacts/hive"
 
 cifmw_hive_oc_delete_timeout: 300
diff --git a/roles/install_yamls/defaults/main.yml b/roles/install_yamls/defaults/main.yml
index 227195c175..c45baff3ce 100644
--- a/roles/install_yamls/defaults/main.yml
+++ b/roles/install_yamls/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_install_yamls"
 cifmw_install_yamls_envfile: "install_yamls.sh"
-cifmw_install_yamls_out_dir_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_install_yamls_out_dir_basedir: "{{ cifmw_basedir }}"
 cifmw_install_yamls_out_dir: "{{ cifmw_install_yamls_out_dir_basedir }}/artifacts"
 cifmw_install_yamls_manifests_dir: "{{ cifmw_manifests | default(cifmw_install_yamls_out_dir_basedir ~ '/artifacts/manifests') }}"
 cifmw_install_yamls_edpm_dir: "{{ cifmw_manifests | default(cifmw_install_yamls_out_dir_basedir ~ '/artifacts/edpm') }}"
diff --git a/roles/install_yamls/tasks/main.yml b/roles/install_yamls/tasks/main.yml
index 5a18eccb87..f9705ab7f8 100644
--- a/roles/install_yamls/tasks/main.yml
+++ b/roles/install_yamls/tasks/main.yml
@@ -24,7 +24,7 @@
   loop:
     - "{{ cifmw_install_yamls_out_dir }}"
     - "{{ cifmw_install_yamls_tasks_out }}"
-    - "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters"
+    - "{{ cifmw_basedir }}/artifacts/parameters"
 
 - name: Create variables with local repos based on Zuul items
   tags:
@@ -166,7 +166,7 @@
   tags:
     - bootstrap
   ansible.builtin.copy:
-    dest: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/install-yamls-params.yml"
+    dest: "{{ cifmw_basedir }}/artifacts/parameters/install-yamls-params.yml"
     content: >-
       {{
         {
diff --git a/roles/kustomize_deploy/defaults/main.yml b/roles/kustomize_deploy/defaults/main.yml
index 653c4440c9..7c09a0fa10 100644
--- a/roles/kustomize_deploy/defaults/main.yml
+++ b/roles/kustomize_deploy/defaults/main.yml
@@ -19,10 +19,7 @@
 
 # default resources
 
-cifmw_kustomize_deploy_basedir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_kustomize_deploy_basedir: "{{ cifmw_basedir }}"
 
 cifmw_kustomize_deploy_architecture_repo_url: "https://github.com/openstack-k8s-operators/architecture"
 
diff --git a/roles/libvirt_manager/defaults/main.yml b/roles/libvirt_manager/defaults/main.yml
index a33e1129cc..797594aac2 100644
--- a/roles/libvirt_manager/defaults/main.yml
+++ b/roles/libvirt_manager/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_libvirt_manager"
 
-cifmw_libvirt_manager_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_libvirt_manager_basedir: "{{ cifmw_basedir }}"
 cifmw_libvirt_manager_enable_virtualization_module: false
 cifmw_libvirt_manager_user: "{{ ansible_user_id | default(lookup('env', 'USER')) }}"
 cifmw_libvirt_manager_images_url: https://cloud.centos.org/centos/9-stream/x86_64/images
diff --git a/roles/manage_secrets/defaults/main.yml b/roles/manage_secrets/defaults/main.yml
index 3e75038dd3..3d2f6123c9 100644
--- a/roles/manage_secrets/defaults/main.yml
+++ b/roles/manage_secrets/defaults/main.yml
@@ -17,10 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_manage_secrets"
-cifmw_manage_secrets_basedir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_manage_secrets_basedir: "{{ cifmw_basedir }}"
 
 cifmw_manage_secrets_owner: "{{ ansible_user_id }}"
 
diff --git a/roles/mirror_registry/defaults/main.yml b/roles/mirror_registry/defaults/main.yml
index c3e971e105..5311e5a904 100644
--- a/roles/mirror_registry/defaults/main.yml
+++ b/roles/mirror_registry/defaults/main.yml
@@ -21,4 +21,4 @@
 cifmw_mirror_registry_install_dir: /opt/mirror-registry
 cifmw_mirror_registry_fqdn: quay.openstack.lab
 cifmw_mirror_registry_release_version: v1.3.10
-cifmw_mirror_registry_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_mirror_registry_basedir: "{{ cifmw_basedir }}"
diff --git a/roles/nat64_appliance/defaults/main.yml b/roles/nat64_appliance/defaults/main.yml
index 94158a434d..1421c1dfe6 100644
--- a/roles/nat64_appliance/defaults/main.yml
+++ b/roles/nat64_appliance/defaults/main.yml
@@ -14,10 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-cifmw_nat64_appliance_basedir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_nat64_appliance_basedir: "{{ cifmw_basedir }}"
 cifmw_nat64_appliance_workdir: "{{ cifmw_nat64_appliance_basedir }}/nat64_appliance"
 cifmw_nat64_appliance_venv_dir: "{{ cifmw_nat64_appliance_workdir }}/venv"
 
diff --git a/roles/networking_mapper/defaults/main.yml b/roles/networking_mapper/defaults/main.yml
index f41b745e55..4f31c19d9e 100644
--- a/roles/networking_mapper/defaults/main.yml
+++ b/roles/networking_mapper/defaults/main.yml
@@ -17,10 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_networking_mapper"
-cifmw_networking_mapper_basedir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_networking_mapper_basedir: "{{ cifmw_basedir }}"
 cifmw_networking_mapper_infra_dir: "/etc/ci/env"
 cifmw_networking_mapper_networking_def_path: >-
   {{ cifmw_networking_mapper_infra_dir }}/networking-definition.yml
diff --git a/roles/openshift_login/defaults/main.yml b/roles/openshift_login/defaults/main.yml
index 4ac7f3eb4f..920ad5f0ee 100644
--- a/roles/openshift_login/defaults/main.yml
+++ b/roles/openshift_login/defaults/main.yml
@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_openshift_login"
-cifmw_openshift_login_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_openshift_login_basedir: "{{ cifmw_basedir }}"
 cifmw_openshift_login_kubeconfig_default_path: "{{ cifmw_openshift_login_basedir ~ '/.kube/config' }}"
 
 cifmw_openshift_login_force_refresh: false
diff --git a/roles/openshift_login/tasks/main.yml b/roles/openshift_login/tasks/main.yml
index f2a9f9d1a8..cdbf5a621c 100644
--- a/roles/openshift_login/tasks/main.yml
+++ b/roles/openshift_login/tasks/main.yml
@@ -96,7 +96,7 @@
       cifmw_openshift_token: "{{ cifmw_openshift_token  }}"
       {% endif %}
   ansible.builtin.copy:
-    dest: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/openshift-login-params.yml"
+    dest: "{{ cifmw_basedir }}/artifacts/parameters/openshift-login-params.yml"
     content: "{{ cifmw_openshift_login_params_content | from_yaml | to_nice_yaml }}"
     mode: "0600"
 - name: Update the install-yamls-params with KUBECONFIG
@@ -104,7 +104,7 @@
   block:
     - name: Read the install yamls parameters file
       ansible.builtin.slurp:
-        path: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/install-yamls-params.yml"
+        path: "{{ cifmw_basedir }}/artifacts/parameters/install-yamls-params.yml"
       register: cifmw_openshift_login_install_yamls_artifacts_slurp
 
     - name: Append the KUBECONFIG to the install yamls parameters
@@ -119,5 +119,5 @@
                 }
               }, recursive=true) | to_nice_yaml
           }}
-        dest: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/install-yamls-params.yml"
+        dest: "{{ cifmw_basedir }}/artifacts/parameters/install-yamls-params.yml"
         mode: "0600"
diff --git a/roles/openshift_provisioner_node/defaults/main.yml b/roles/openshift_provisioner_node/defaults/main.yml
index de62500230..21cb7e19f7 100644
--- a/roles/openshift_provisioner_node/defaults/main.yml
+++ b/roles/openshift_provisioner_node/defaults/main.yml
@@ -21,6 +21,6 @@
 cifmw_opn_external_bridge_name: "baremetal"
 cifmw_opn_prov_bridge_name: "provisioning"
 
-cifmw_opn_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_opn_basedir: "{{ cifmw_basedir }}"
 cifmw_opn_artifacts_dir: "{{ cifmw_opn_basedir }}/artifacts"
 cifmw_opn_dry_run: false
diff --git a/roles/openshift_provisioner_node/molecule/default/converge.yml b/roles/openshift_provisioner_node/molecule/default/converge.yml
index 9697682865..4b7eb3fd00 100644
--- a/roles/openshift_provisioner_node/molecule/default/converge.yml
+++ b/roles/openshift_provisioner_node/molecule/default/converge.yml
@@ -24,7 +24,7 @@
     cifmw_use_opn: true
     cifmw_opn_use_provisioning_network: false
     cifmw_opn_user: kni
-    cifmw_opn_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
+    cifmw_opn_basedir: "{{ cifmw_basedir }}"
 
   tasks:
     - name: Including the openshift provisioner node role.
diff --git a/roles/openshift_setup/defaults/main.yml b/roles/openshift_setup/defaults/main.yml
index 2133089aeb..0acb473931 100644
--- a/roles/openshift_setup/defaults/main.yml
+++ b/roles/openshift_setup/defaults/main.yml
@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_openshift_setup"
-cifmw_openshift_setup_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_openshift_setup_basedir: "{{ cifmw_basedir }}"
 cifmw_openshift_setup_dry_run: false
 cifmw_openshift_setup_create_namespaces: []
 cifmw_openshift_setup_skip_internal_registry: false
diff --git a/roles/operator_build/defaults/main.yml b/roles/operator_build/defaults/main.yml
index a5f4dabb09..df5bb254e2 100644
--- a/roles/operator_build/defaults/main.yml
+++ b/roles/operator_build/defaults/main.yml
@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-cifmw_operator_build_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_operator_build_basedir: "{{ cifmw_basedir }}"
 cifmw_operator_build_dryrun: false
 cifmw_operator_build_golang_ct: "docker.io/library/golang:1.20"
 cifmw_operator_build_golang_alt_ct: "quay.rdoproject.org/openstack-k8s-operators/golang:1.20"
diff --git a/roles/operator_deploy/defaults/main.yml b/roles/operator_deploy/defaults/main.yml
index 93eb9ca3dd..200a8e6819 100644
--- a/roles/operator_deploy/defaults/main.yml
+++ b/roles/operator_deploy/defaults/main.yml
@@ -19,7 +19,7 @@
 # All variables within this role should have a prefix of "cifmw_operator_deploy"
 
 # output base directory
-cifmw_operator_deploy_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_operator_deploy_basedir: "{{ cifmw_basedir }}"
 # List of operators you want to deploy
 cifmw_operator_deploy_list: []
 # install_yamls repository location
diff --git a/roles/os_must_gather/defaults/main.yml b/roles/os_must_gather/defaults/main.yml
index 72050e8e36..d93092f1d1 100644
--- a/roles/os_must_gather/defaults/main.yml
+++ b/roles/os_must_gather/defaults/main.yml
@@ -20,7 +20,7 @@
 cifmw_os_must_gather_image: "quay.io/openstack-k8s-operators/openstack-must-gather:latest"
 cifmw_os_must_gather_image_push: true
 cifmw_os_must_gather_image_registry: "quay.rdoproject.org/openstack-k8s-operators"
-cifmw_os_must_gather_output_dir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_os_must_gather_output_dir: "{{ cifmw_basedir }}"
 cifmw_os_must_gather_output_log_dir: "{{ cifmw_os_must_gather_output_dir }}/logs/openstack-must-gather"
 cifmw_os_must_gather_repo_path: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/openstack-must-gather"
 cifmw_os_must_gather_timeout: "30m"
diff --git a/roles/ovirt/defaults/main.yml b/roles/ovirt/defaults/main.yml
index 6182a925bd..f94eccc66c 100644
--- a/roles/ovirt/defaults/main.yml
+++ b/roles/ovirt/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_ovirt"
 
-cifmw_ovirt_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts"
+cifmw_ovirt_artifacts_basedir: "{{ cifmw_basedir }}/artifacts"
 cifmw_ovirt_ssh_key_type: "{{ cifmw_ssh_keytype | default('ecdsa') }}"
 cifmw_ovirt_ssh_key_size: "{{ cifmw_ssh_keysize | default(521) }}"
 cifmw_ovirt_ssh_public_key: ""
diff --git a/roles/pkg_build/defaults/main.yml b/roles/pkg_build/defaults/main.yml
index 6b525ea67c..b07dfee879 100644
--- a/roles/pkg_build/defaults/main.yml
+++ b/roles/pkg_build/defaults/main.yml
@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_pkg_build"
-cifmw_pkg_build_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_pkg_build_basedir: "{{ cifmw_basedir }}"
 cifmw_pkg_build_ctx_name: "localhost/cifmw-buildpkgs"
 cifmw_pkg_build_ctx_tag: "latest"
 cifmw_pkg_build_ctx_push: false
diff --git a/roles/polarion/defaults/main.yml b/roles/polarion/defaults/main.yml
index aa685bc26e..410798a85e 100644
--- a/roles/polarion/defaults/main.yml
+++ b/roles/polarion/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_polarion"
 
-cifmw_polarion_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_polarion_basedir: "{{ cifmw_basedir }}"
 cifmw_polarion_jump_custom_fields: {}
 cifmw_polarion_jump_repo_dir: "{{ cifmw_polarion_basedir }}/polarion-jump"
 cifmw_polarion_jump_result_dir: "{{ cifmw_polarion_basedir }}/tests/{{ cifmw_run_test_role | default('tempest') }}/"
diff --git a/roles/repo_setup/defaults/main.yml b/roles/repo_setup/defaults/main.yml
index 61d4bd8ed0..5929b16e41 100644
--- a/roles/repo_setup/defaults/main.yml
+++ b/roles/repo_setup/defaults/main.yml
@@ -19,7 +19,7 @@
 # All variables within this role should have a prefix of "cifmw_setup_repos"
 # To get dlrn md5 hash for components [baremetal,cinder,clients,cloudops,common,
 # compute,glance,manila,network,octavia,security,swift,tempest,podified,ui,validation]
-cifmw_repo_setup_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_repo_setup_basedir: "{{ cifmw_basedir }}"
 cifmw_repo_setup_venv: "{{ cifmw_repo_setup_basedir }}/venv/repo-setup"
 cifmw_repo_setup_promotion: "current-podified"
 cifmw_repo_setup_branch: "antelope"
diff --git a/roles/reportportal/defaults/main.yml b/roles/reportportal/defaults/main.yml
index acbf8f8b0f..68e1763014 100644
--- a/roles/reportportal/defaults/main.yml
+++ b/roles/reportportal/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 cifmw_reportportal_dry_run: false
-cifmw_reportportal_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_reportportal_basedir: "{{ cifmw_basedir }}"
 cifmw_reportportal_datarouter_url: ""
 cifmw_reportportal_datarouter_username: ""
 cifmw_reportportal_datarouter_password: ""
diff --git a/roles/reproducer/defaults/main.yml b/roles/reproducer/defaults/main.yml
index 7896cdbb71..aed8b71b92 100644
--- a/roles/reproducer/defaults/main.yml
+++ b/roles/reproducer/defaults/main.yml
@@ -20,7 +20,7 @@
 cifmw_reproducer_controller_user: "{{ hostvars['controller-0']['ansible_ssh_user'] | default('zuul') }}"
 cifmw_reproducer_controller_user_dir: "/home/{{ cifmw_reproducer_controller_user }}"
 cifmw_reproducer_controller_basedir: "{{ cifmw_reproducer_controller_user_dir }}/ci-framework-data"
-cifmw_reproducer_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_reproducer_basedir: "{{ cifmw_basedir }}"
 cifmw_reproducer_src_dir: "{{ cifmw_ci_src_dir | default( ansible_user_dir ~ '/src') }}"
 cifmw_reproducer_kubecfg: "{{ cifmw_libvirt_manager_configuration.vms.crc.image_local_dir }}/kubeconfig"
 cifmw_reproducer_params: {}
diff --git a/roles/rhol_crc/defaults/main.yml b/roles/rhol_crc/defaults/main.yml
index 5bcfb9fc6f..3b062f660c 100644
--- a/roles/rhol_crc/defaults/main.yml
+++ b/roles/rhol_crc/defaults/main.yml
@@ -39,8 +39,7 @@ cifmw_rhol_crc_base_url: >-
 # In case we don't use cifmw_basedir it will get the
 # base_dir of the project if .git exists - change dir
 # does not affect other tasks:
-cifmw_rhol_crc_basedir: >-
-  {{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}
+cifmw_rhol_crc_basedir: "{{ cifmw_basedir }}"
 cifmw_rhol_crc_binary_folder: "{{ ansible_user_dir }}/bin"
 cifmw_rhol_crc_binary: "{{ cifmw_rhol_crc_binary_folder }}/crc"
 cifmw_rhol_crc_force_cleanup: false
diff --git a/roles/run_hook/tasks/playbook.yml b/roles/run_hook/tasks/playbook.yml
index f6843ac380..de6b1e5c53 100644
--- a/roles/run_hook/tasks/playbook.yml
+++ b/roles/run_hook/tasks/playbook.yml
@@ -12,8 +12,17 @@
       {%- else -%}
       {{ hook.source }}
       {%- endif -%}
-    _bdir: >-
-      {{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}
+    _bdir: "{{ cifmw_basedir }}"
+    _operator_namespace: >-
+      {{
+        cifmw_install_yamls_defaults['OPERATOR_NAMESPACE'] |
+        default('openstack-operators')
+      }}
+    _namespace: >-
+      {{
+        cifmw_install_yamls_defaults['NAMESPACE'] |
+        default('openstack')
+      }}
   ansible.builtin.set_fact:
     cifmw_basedir: "{{ _bdir }}"
     hook_name: "{{ _hook_name }}"
diff --git a/roles/set_openstack_containers/defaults/main.yml b/roles/set_openstack_containers/defaults/main.yml
index 22b88a6ac5..f2e2426301 100644
--- a/roles/set_openstack_containers/defaults/main.yml
+++ b/roles/set_openstack_containers/defaults/main.yml
@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_set_openstack_containers"
-cifmw_set_openstack_containers_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_set_openstack_containers_basedir: "{{ cifmw_basedir }}"
 cifmw_set_openstack_containers_registry: quay.io
 cifmw_set_openstack_containers_namespace: podified-antelope-centos9
 cifmw_set_openstack_containers_tag: current-podified
diff --git a/roles/shiftstack/defaults/main.yml b/roles/shiftstack/defaults/main.yml
index 1fc9401d18..7136359fad 100644
--- a/roles/shiftstack/defaults/main.yml
+++ b/roles/shiftstack/defaults/main.yml
@@ -19,7 +19,7 @@
 # All variables within this role should have a prefix of "cifmw_shiftstack"
 cifmw_shiftstack_ansible_command_logs_dir: "{{ cifmw_shiftstack_basedir }}/ansible_command_logs"
 cifmw_shiftstack_artifacts_dir: "{{ cifmw_shiftstack_basedir }}/artifacts"
-cifmw_shiftstack_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/tests/shiftstack"
+cifmw_shiftstack_basedir: "{{ cifmw_basedir }}/tests/shiftstack"
 cifmw_shiftstack_client_incluster_secret_manifest: "{{ cifmw_shiftstack_client_pod_name }}_incluster_secret.yml"
 cifmw_shiftstack_client_incluster_secret_name: "incluster-kubeconfig"
 cifmw_shiftstack_client_pod_image: "quay.io/shiftstack-qe/shiftstack-client:latest"
diff --git a/roles/sushy_emulator/defaults/main.yml b/roles/sushy_emulator/defaults/main.yml
index 006fd15249..5942356a70 100644
--- a/roles/sushy_emulator/defaults/main.yml
+++ b/roles/sushy_emulator/defaults/main.yml
@@ -18,8 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_sushy_emulator"
 
-cifmw_sushy_emulator_basedir: >-
-  {{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}
+cifmw_sushy_emulator_basedir: "{{ cifmw_basedir }}"
 cifmw_sushy_emulator_container_name: "cifmw-sushy_emulator"
 cifmw_sushy_emulator_driver: libvirt
 cifmw_sushy_emulator_driver_openstack_client_config_file: /etc/openstack/clouds.yaml
diff --git a/roles/tempest/defaults/main.yml b/roles/tempest/defaults/main.yml
index 0c65635699..6b387409c9 100644
--- a/roles/tempest/defaults/main.yml
+++ b/roles/tempest/defaults/main.yml
@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_tempest"
-cifmw_tempest_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/tests/tempest"
+cifmw_tempest_artifacts_basedir: "{{ cifmw_basedir }}/tests/tempest"
 cifmw_tempest_default_groups:
   - default
 cifmw_tempest_default_jobs:
diff --git a/roles/test_operator/defaults/main.yml b/roles/test_operator/defaults/main.yml
index 5ceef73688..ecfdc3b4fb 100644
--- a/roles/test_operator/defaults/main.yml
+++ b/roles/test_operator/defaults/main.yml
@@ -23,7 +23,7 @@ cifmw_test_operator_stages:
   - name: tempest
     type: tempest
 cifmw_test_operator_fail_on_test_failure: true
-cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/tests/test_operator"
+cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir }}/tests/test_operator"
 cifmw_test_operator_namespace: openstack
 cifmw_test_operator_controller_namespace: openstack-operators
 cifmw_test_operator_bundle: ""
@@ -42,7 +42,7 @@ cifmw_test_operator_storage_class: "{{ cifmw_test_operator_storage_class_prefix
 cifmw_test_operator_delete_logs_pod: false
 cifmw_test_operator_privileged: true
 cifmw_test_operator_selinux_level: "s0:c478,c978"
-cifmw_test_operator_crs_path: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/test-operator-crs"
+cifmw_test_operator_crs_path: "{{ cifmw_basedir }}/artifacts/test-operator-crs"
 cifmw_test_operator_log_pod_definition:
   apiVersion: v1
   kind: Pod
diff --git a/roles/update/tasks/update_variant_split.yml b/roles/update/tasks/update_variant_split.yml
index 346408cfa0..d5242c8552 100644
--- a/roles/update/tasks/update_variant_split.yml
+++ b/roles/update/tasks/update_variant_split.yml
@@ -22,7 +22,7 @@
 
 - name: Run tests after Services update
   vars:
-    cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/tests/test_operator_update"
+    cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir }}/tests/test_operator_update"
     cifmw_test_operator_tempest_name: "post-services-update-tempest-tests"
   ansible.builtin.include_role:
     name: cifmw_setup
diff --git a/roles/update_containers/defaults/main.yml b/roles/update_containers/defaults/main.yml
index da7c0e65b6..5b4d8a2126 100644
--- a/roles/update_containers/defaults/main.yml
+++ b/roles/update_containers/defaults/main.yml
@@ -20,10 +20,7 @@
 
 cifmw_update_containers: false
 cifmw_update_containers_namespace: openstack
-cifmw_update_containers_base_dir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_update_containers_base_dir: "{{ cifmw_basedir }}"
 cifmw_update_containers_dest_path: >-
   {{
     [
diff --git a/roles/validations/defaults/main.yml b/roles/validations/defaults/main.yml
index fbc9d2cfdd..4570670a4e 100644
--- a/roles/validations/defaults/main.yml
+++ b/roles/validations/defaults/main.yml
@@ -40,7 +40,7 @@ cifmw_validations_default_path: "{{ role_path }}/tasks"
 cifmw_validations_edpm_check_node: compute-0
 cifmw_validations_edpm_second_check_node: compute-1
 
-cifmw_validations_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_validations_basedir: "{{ cifmw_basedir }}"
 
 cifmw_validations_namespace: "openstack"
 
diff --git a/scenarios/centos-9/base.yml b/scenarios/centos-9/base.yml
index f9cefb94d1..9492a0bcc0 100644
--- a/scenarios/centos-9/base.yml
+++ b/scenarios/centos-9/base.yml
@@ -2,4 +2,3 @@
 # Configure base system to match centos
 cifmw_repo_setup_os_release: 'centos'
 cifmw_repo_setup_dist_major_version: 9
-cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
diff --git a/scenarios/centos-9/kuttl.yml b/scenarios/centos-9/kuttl.yml
index ea3ab7544c..cc75d6065e 100644
--- a/scenarios/centos-9/kuttl.yml
+++ b/scenarios/centos-9/kuttl.yml
@@ -1,6 +1,6 @@
 ---
 cifmw_install_yamls_vars:
   BMO_SETUP: false
-cifmw_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_artifacts_basedir: "{{ cifmw_basedir }}"
 
 cifmw_openshift_setup_skip_internal_registry: true
diff --git a/scenarios/reproducers/3-nodes.yml b/scenarios/reproducers/3-nodes.yml
index eb30c5243c..e4f9dea487 100644
--- a/scenarios/reproducers/3-nodes.yml
+++ b/scenarios/reproducers/3-nodes.yml
@@ -3,7 +3,6 @@
 # We can't use ansible_user_dir here, unless you have the same user on the
 # hypervisor and locally.
 # This will be created on the hypervisor.
-cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
 cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
 
 cifmw_rhol_crc_config:
diff --git a/scenarios/reproducers/va-common.yml b/scenarios/reproducers/va-common.yml
index 5b92bcb41c..b5dfcc72fa 100644
--- a/scenarios/reproducers/va-common.yml
+++ b/scenarios/reproducers/va-common.yml
@@ -10,7 +10,6 @@
 
 
 # Ensure some basic directories and parameter are set
-cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
 cifmw_path: "{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
 
 # Ensure our vbmcd isn't conflicting with devscripts managed instance
diff --git a/update-edpm.yml b/update-edpm.yml
index 22f37dca55..518d3f31e2 100644
--- a/update-edpm.yml
+++ b/update-edpm.yml
@@ -26,7 +26,7 @@
   tasks:
     - name: Run Test
       vars:
-        cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/tests/test_operator_update"
+        cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir }}/tests/test_operator_update"
         cifmw_test_operator_tempest_name: "post-update-tempest-tests"
         cifmw_test_operator_tobiko_name: "post-update-tobiko-tests"
       ansible.builtin.import_role: