diff --git a/.github/workflows/multiTenant_deploy_and_Integration_test.yml b/.github/workflows/multiTenant_deploy_and_Integration_test.yml
index 00cf9175..12d5fdd1 100644
--- a/.github/workflows/multiTenant_deploy_and_Integration_test.yml
+++ b/.github/workflows/multiTenant_deploy_and_Integration_test.yml
@@ -310,6 +310,7 @@ jobs:
           NOSDMROLEUSERPASSWORD: ${{ secrets.NOSDMROLEUSERPASSWORD }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
           DEFAULTREPOSITORYIDMT: ${{ secrets.DEFAULTREPOSITORYIDMT }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           echo "🚀 Preparing credentials for ${{ matrix.tokenFlow }} - ${{ matrix.tenant }}..."
           set +x
@@ -678,6 +679,7 @@ jobs:
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
           DEFAULTREPOSITORYIDMT: ${{ secrets.DEFAULTREPOSITORYIDMT }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
@@ -1006,6 +1008,7 @@ jobs:
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
           DEFAULTREPOSITORYIDMT: ${{ secrets.DEFAULTREPOSITORYIDMT }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
@@ -1320,6 +1323,7 @@ jobs:
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
           DEFAULTREPOSITORYIDMT: ${{ secrets.DEFAULTREPOSITORYIDMT }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
@@ -1589,6 +1593,7 @@ jobs:
           CONSUMERSUBDOMAINMT: ${{ secrets.CONSUMERSUBDOMAINMT }}
           BTP_CLI_URL: ${{ secrets.BTP_CLI_URL }}
           BTP_GLOBAL_ACCOUNT_SUBDOMAIN: ${{ secrets.BTP_GLOBAL_ACCOUNT_SUBDOMAIN }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
diff --git a/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml b/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml
index 95a0cbce..989d972e 100644
--- a/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml
+++ b/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml
@@ -361,6 +361,7 @@ jobs:
           NOSDMROLEUSERPASSWORD: ${{ secrets.NOSDMROLEUSERPASSWORD }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
           DEFAULTREPOSITORYIDMT: ${{ secrets.DEFAULTREPOSITORYIDMT }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           echo "🚀 Preparing credentials for ${{ matrix.tokenFlow }} - ${{ matrix.tenant }}..."
           set +x
@@ -729,6 +730,7 @@ jobs:
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
           DEFAULTREPOSITORYIDMT: ${{ secrets.DEFAULTREPOSITORYIDMT }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
@@ -1057,6 +1059,7 @@ jobs:
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
           DEFAULTREPOSITORYIDMT: ${{ secrets.DEFAULTREPOSITORYIDMT }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
@@ -1371,6 +1374,7 @@ jobs:
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
           DEFAULTREPOSITORYIDMT: ${{ secrets.DEFAULTREPOSITORYIDMT }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
@@ -1640,6 +1644,7 @@ jobs:
           CONSUMERSUBDOMAINMT: ${{ secrets.CONSUMERSUBDOMAINMT }}
           BTP_CLI_URL: ${{ secrets.BTP_CLI_URL }}
           BTP_GLOBAL_ACCOUNT_SUBDOMAIN: ${{ secrets.BTP_GLOBAL_ACCOUNT_SUBDOMAIN }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
diff --git a/.github/workflows/singleTenant_deploy_and_Integration_test.yml b/.github/workflows/singleTenant_deploy_and_Integration_test.yml
index 2522070f..afc329d4 100644
--- a/.github/workflows/singleTenant_deploy_and_Integration_test.yml
+++ b/.github/workflows/singleTenant_deploy_and_Integration_test.yml
@@ -281,6 +281,7 @@ jobs:
           VERSIONEDREPOSITORYID: ${{ secrets.VERSIONEDREPOSITORYID }}
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set +x
           echo "🚀 Starting integration tests for ${{ matrix.tokenFlow }} - ${{ matrix.testClass }}..."
@@ -578,6 +579,7 @@ jobs:
           VERSIONEDREPOSITORYID: ${{ secrets.VERSIONEDREPOSITORYID }}
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
@@ -861,6 +863,7 @@ jobs:
           VERSIONEDREPOSITORYID: ${{ secrets.VERSIONEDREPOSITORYID }}
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
@@ -1130,6 +1133,7 @@ jobs:
           VERSIONEDREPOSITORYID: ${{ secrets.VERSIONEDREPOSITORYID }}
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
diff --git a/.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml b/.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml
index c6013428..a9dca6ba 100644
--- a/.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml
+++ b/.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml
@@ -334,6 +334,7 @@ jobs:
           VERSIONEDREPOSITORYID: ${{ secrets.VERSIONEDREPOSITORYID }}
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set +x
           echo "🚀 Starting integration tests for ${{ matrix.tokenFlow }} - ${{ matrix.testClass }}..."
@@ -631,6 +632,7 @@ jobs:
           VERSIONEDREPOSITORYID: ${{ secrets.VERSIONEDREPOSITORYID }}
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
@@ -914,6 +916,7 @@ jobs:
           VERSIONEDREPOSITORYID: ${{ secrets.VERSIONEDREPOSITORYID }}
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"
@@ -1183,6 +1186,7 @@ jobs:
           VERSIONEDREPOSITORYID: ${{ secrets.VERSIONEDREPOSITORYID }}
           VIRUSSCANREPOSITORYID: ${{ secrets.VIRUSSCANREPOSITORYID }}
           DEFAULTREPOSITORYID: ${{ secrets.DEFAULTREPOSITORYID }}
+          CF_SPACE: ${{ secrets.CF_SPACE }}
         run: |
           set -e
           PROPERTIES_FILE="sdm/src/test/resources/credentials.properties"