diff --git a/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml b/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml
index 33227f258..c88404c5f 100644
--- a/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml
+++ b/tests/roles/dataplane_adoption/tasks/nova_ffu.yaml
@@ -1,8 +1,3 @@
-- name: get dst database service environment variables
-  ansible.builtin.include_role:
-    name: mariadb_copy
-    tasks_from: env_vars_dst.yaml
-
 - name: wait for cell1 Nova compute EDPM services version updated
   ansible.builtin.shell: |
     {{ shell_header }}
diff --git a/tests/roles/mariadb_copy/tasks/env_vars_dst.yaml b/tests/roles/mariadb_copy/tasks/env_vars_dst.yaml
deleted file mode 100644
index f1538fd59..000000000
--- a/tests/roles/mariadb_copy/tasks/env_vars_dst.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-- name: get podified MariaDB service cluster IP
-  ansible.builtin.shell: |
-    {{ shell_header }}
-    {{ oc_header }}
-    oc get svc --selector "mariadb/name=openstack" -n {{ rhoso_namespace }} -ojsonpath='{.items[0].spec.clusterIP}'
-  register: podified_mariadb_ip_result
-
-- name: get podified cell1 MariaDB IP
-  ansible.builtin.shell: |
-    {{ shell_header }}
-    {{ oc_header }}
-    oc get svc --selector "mariadb/name=openstack-cell1" -n {{ rhoso_namespace }} -ojsonpath='{.items[0].spec.clusterIP}'
-  register: podified_cell1_mariadb_ip_result
-
-- name: set MariaDB copy shell vars
-  no_log: "{{ use_no_log }}"
-  ansible.builtin.set_fact:
-    mariadb_copy_shell_vars_dst: |
-      PODIFIED_MARIADB_IP={{ podified_mariadb_ip_result.stdout }}
-      PODIFIED_CELL1_MARIADB_IP={{ podified_cell1_mariadb_ip_result.stdout }}
-      PODIFIED_DB_ROOT_PASSWORD="{{ podified_db_root_password }}"
-
-      # The CHARACTER_SET and collation should match the source DB
-      # if the do not then it will break foreign key relationships
-      # for any tables that are created in the future as part of db sync
-      CHARACTER_SET=utf8
-      COLLATION=utf8_general_ci
diff --git a/tests/roles/mariadb_copy/tasks/env_vars_src.yaml b/tests/roles/mariadb_copy/tasks/env_vars_src.yaml
deleted file mode 100644
index 378e3840b..000000000
--- a/tests/roles/mariadb_copy/tasks/env_vars_src.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- name: set src MariaDB copy shell vars
-  no_log: "{{ use_no_log }}"
-  ansible.builtin.set_fact:
-    mariadb_copy_shell_vars_src: |
-      MARIADB_IMAGE=quay.io/podified-antelope-centos9/openstack-mariadb:current-podified
-      STORAGE_CLASS={{ storage_class_name }}
-      # TODO: remove the default(external_...) when CI is transitioned to use 'source_...'
-      SOURCE_MARIADB_IP={{ source_mariadb_ip|default(external_mariadb_ip) }}
-      declare -A SOURCE_GALERA_MEMBERS
-      SOURCE_GALERA_MEMBERS=(
-        {{  source_galera_members }}
-      )
-      SOURCE_DB_ROOT_PASSWORD="{{ source_db_root_password|default(external_db_root_password) }}"
-      MARIADB_CLIENT_ANNOTATIONS='--annotations=k8s.v1.cni.cncf.io/networks=internalapi'
-  when: not ospdo_src| bool
diff --git a/tests/roles/mariadb_copy/tasks/env_vars_src_ospdo.yaml b/tests/roles/mariadb_copy/tasks/env_vars_src_ospdo.yaml
index fc03a54e4..b03aec702 100644
--- a/tests/roles/mariadb_copy/tasks/env_vars_src_ospdo.yaml
+++ b/tests/roles/mariadb_copy/tasks/env_vars_src_ospdo.yaml
@@ -23,12 +23,14 @@
         mariadb_copy_shell_vars_src: |
           MARIADB_IMAGE=quay.io/podified-antelope-centos9/openstack-mariadb:current-podified
           STORAGE_CLASS=host-nfs-storageclass
-          SOURCE_MARIADB_IP={{ source_mariadb_ip.stdout }}
-          declare -A SOURCE_GALERA_MEMBERS
-          SOURCE_GALERA_MEMBERS=(
+          declare -A SOURCE_MARIADB_IP
+          SOURCE_MARIADB_IP['default']={{ source_mariadb_ip.stdout }}
+          declare -A SOURCE_GALERA_MEMBERS_DEFAULT
+          SOURCE_GALERA_MEMBERS_DEFAULT=(
           ["standalone.localdomain"]={{ source_mariadb_ip.stdout }}
           )
-          SOURCE_DB_ROOT_PASSWORD={{ source_db_root_pass.stdout }}
+          declare -A SOURCE_DB_ROOT_PASSWORD
+          SOURCE_DB_ROOT_PASSWORD['default']={{ source_db_root_pass.stdout }}
           MARIADB_CLIENT_ANNOTATIONS="-n {{ org_namespace }}"
           CONTROLLER_NODE={{ controller_node.stdout }}