diff --git a/roles/sap_install_media_detect/defaults/main.yml b/roles/sap_install_media_detect/defaults/main.yml
index 8e73b1e32..b99bbeb35 100644
--- a/roles/sap_install_media_detect/defaults/main.yml
+++ b/roles/sap_install_media_detect/defaults/main.yml
@@ -67,6 +67,7 @@ sap_install_media_detect_assert_after_sapfile: true
 
 # Typical parameter settings for SAP S/4HANA:
 sap_install_media_detect_db: 'saphana'  # saphana, sapase, sapmaxdb, oracledb, ibmdb2
+sap_install_media_detect_db_client: 'saphana'  # saphana, sapase, sapmaxdb, oracledb, ibmdb2
 sap_install_media_detect_swpm: true
 sap_install_media_detect_hostagent: true
 sap_install_media_detect_igs: true
@@ -79,6 +80,7 @@ sap_install_media_detect_export: 'saps4hana'  # saps4hana, sapbw4hana, sapecc, s
 
 # Typical parameter settings for SAP ERP 6.0 EHP8 with SAP HANA database:
 #sap_install_media_detect_db: 'saphana'  # saphana, sapase, sapmaxdb, oracledb, ibmdb2
+#sap_install_media_detect_db_client: 'saphana'  # saphana, sapase, sapmaxdb, oracledb, ibmdb2
 #sap_install_media_detect_swpm: true
 #sap_install_media_detect_hostagent: true
 #sap_install_media_detect_igs: true
diff --git a/roles/sap_install_media_detect/tasks/prepare/create_file_list_phase_2.yml b/roles/sap_install_media_detect/tasks/prepare/create_file_list_phase_2.yml
index aab5000c2..b22b500e2 100644
--- a/roles/sap_install_media_detect/tasks/prepare/create_file_list_phase_2.yml
+++ b/roles/sap_install_media_detect/tasks/prepare/create_file_list_phase_2.yml
@@ -219,7 +219,8 @@
           - __sap_install_media_detect_fact_files_sapfile_results | selectattr('sap_file_type', 'equalto', 'saphana_client') | length > 0
         fail_msg: "No file found for saphana_client"
       when:
-        - (sap_install_media_detect_db | d('')) == 'saphana'
+        - (sap_install_media_detect_db | d('')) == 'saphana' or
+          (sap_install_media_detect_db_client | d('')) == 'saphana'
 
     - name: SAP Install Media Detect - Prepare - Assert that sapase is present
       ansible.builtin.assert:
@@ -235,7 +236,8 @@
           - __sap_install_media_detect_fact_files_sapfile_results | selectattr('sap_file_type', 'equalto', 'sapase_client') | length > 0
         fail_msg: "No file found for sapase_client"
       when:
-        - (sap_install_media_detect_db | d('')) == 'sapase'
+        - (sap_install_media_detect_db | d('')) == 'sapase' or
+          (sap_install_media_detect_db_client | d('')) == 'sapase'
 
     - name: SAP Install Media Detect - Prepare - Assert that sapmaxdb is present
       ansible.builtin.assert:
@@ -259,7 +261,8 @@
           - __sap_install_media_detect_fact_files_sapfile_results | selectattr('sap_file_type', 'equalto', 'oracledb_client') | length > 0
         fail_msg: "No file found for oracledb_client"
       when:
-        - (sap_install_media_detect_db | d('')) == 'oracledb'
+        - (sap_install_media_detect_db | d('')) == 'oracledb' or
+          (sap_install_media_detect_db_client | d('')) == 'oracledb'
 
     - name: SAP Install Media Detect - Prepare - Assert that ibmdb2 is present
       ansible.builtin.assert:
@@ -275,7 +278,8 @@
           - __sap_install_media_detect_fact_files_sapfile_results | selectattr('sap_file_type', 'equalto', 'ibmdb2_client') | length > 0
         fail_msg: "No file found for ibmdb2_client"
       when:
-        - (sap_install_media_detect_db | d('')) == 'ibmdb2'
+        - (sap_install_media_detect_db | d('')) == 'ibmdb2' or
+          (sap_install_media_detect_db_client | d('')) == 'ibmdb2'
 
     - name: SAP Install Media Detect - Prepare - Assert that ibmdb2_license is present
       ansible.builtin.assert: