diff --git a/.github/workflows/blackduck.yml b/.github/workflows/blackduck.yml
index 7514912f..2d500720 100644
--- a/.github/workflows/blackduck.yml
+++ b/.github/workflows/blackduck.yml
@@ -42,40 +42,14 @@ jobs:
           mvn clean install -f app/single-tenant/central-space/demoapp/pom.xml -DskipTests
           mvn clean install -f app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml -DskipTests
 
-      - name: Setup npm registries and install SAP packages
-        env:
-          NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-          SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
-          SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
+      - name: Install npm dependencies
         run: |
-          set +x
-          echo "::add-mask::$NPM_AUTH_TOKEN"
-          echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
-          echo "::add-mask::$SAP_CDS_DK_TARBALL"
-
-          MTXS="$SAP_CDS_MTXS_TARBALL"
-          DK="$SAP_CDS_DK_TARBALL"
-          TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
-
           for dir in \
             "app/multi-tenant/central-space/cloud-cap-samples-java" \
             "app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar" \
             "app/multi-tenant/personal-space/cloud-cap-samples-java" \
             "app/multi-tenant/personal-space/cloud-cap-samples-java/mtx/sidecar"; do
-
-            printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
-              "$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
-
-            tmp=$(mktemp)
-            jq --arg mtxs "$MTXS" --arg dk "$DK" '
-              (if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
-              | (if .dependencies["@sap/cds-dk"]   then .dependencies["@sap/cds-dk"]   = $dk   else . end)
-              | .overrides["@sap/cds-mtxs"] = $mtxs
-            ' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
-
-            npm install --prefix "$dir"
-
-            git checkout "$dir/package.json"
+            npm install --prefix "$dir" --legacy-peer-deps
           done
 
       # - name: Download Synopsys Detect Script
diff --git a/.github/workflows/cfdeploy.yml b/.github/workflows/cfdeploy.yml
index 637f9e57..d8c83d70 100644
--- a/.github/workflows/cfdeploy.yml
+++ b/.github/workflows/cfdeploy.yml
@@ -76,36 +76,6 @@ jobs:
             fi
           fi
 
-      - name: Setup npm registry and pin SAP tarballs 📦
-        env:
-          NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-          SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
-          SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
-        run: |
-          set +x
-          echo "::add-mask::$NPM_AUTH_TOKEN"
-          echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
-          echo "::add-mask::$SAP_CDS_DK_TARBALL"
-
-          MTXS="$SAP_CDS_MTXS_TARBALL"
-          DK="$SAP_CDS_DK_TARBALL"
-          TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
-
-          for dir in \
-            "app/single-tenant/personal-space/demoapp" \
-            "app/single-tenant/personal-space/demoapp/db" \
-            "app/single-tenant/personal-space/demoapp/app"; do
-
-            printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
-              "$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
-
-            tmp=$(mktemp)
-            jq --arg mtxs "$MTXS" --arg dk "$DK" '
-              (if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
-              | (if .dependencies["@sap/cds-dk"]   then .dependencies["@sap/cds-dk"]   = $dk   else . end)
-            ' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
-          done
-
       - name: Prepare and Deploy to Cloud Foundry ☁️
         run: |
           set +x
@@ -244,36 +214,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup npm registry and pin SAP tarballs 📦
-        env:
-          NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-          SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
-          SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
-        run: |
-          set +x
-          echo "::add-mask::$NPM_AUTH_TOKEN"
-          echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
-          echo "::add-mask::$SAP_CDS_DK_TARBALL"
-
-          MTXS="$SAP_CDS_MTXS_TARBALL"
-          DK="$SAP_CDS_DK_TARBALL"
-          TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
-
-          for dir in \
-            "app/single-tenant/central-space/demoapp" \
-            "app/single-tenant/central-space/demoapp/db" \
-            "app/single-tenant/central-space/demoapp/app"; do
-
-            printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
-              "$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
-
-            tmp=$(mktemp)
-            jq --arg mtxs "$MTXS" --arg dk "$DK" '
-              (if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
-              | (if .dependencies["@sap/cds-dk"]   then .dependencies["@sap/cds-dk"]   = $dk   else . end)
-            ' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
-          done
-
       - name: Prepare and Deploy to Cloud Foundry ☁️
         run: |
           set +x
diff --git a/.github/workflows/multiTenancyDeployLocal.yml b/.github/workflows/multiTenancyDeployLocal.yml
index dd5d767f..b9379e38 100644
--- a/.github/workflows/multiTenancyDeployLocal.yml
+++ b/.github/workflows/multiTenancyDeployLocal.yml
@@ -52,35 +52,6 @@ jobs:
         with:
           node-version: '20' # Ensure to use at least version 18
 
-      - name: Setup npm registry and pin SAP tarballs 📦
-        env:
-          NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-          SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
-          SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
-        run: |
-          set +x
-          echo "::add-mask::$NPM_AUTH_TOKEN"
-          echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
-          echo "::add-mask::$SAP_CDS_DK_TARBALL"
-
-          MTXS="$SAP_CDS_MTXS_TARBALL"
-          DK="$SAP_CDS_DK_TARBALL"
-          TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
-
-          for dir in \
-            "app/multi-tenant/personal-space/cloud-cap-samples-java" \
-            "app/multi-tenant/personal-space/cloud-cap-samples-java/mtx/sidecar"; do
-
-            printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
-              "$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
-
-            tmp=$(mktemp)
-            jq --arg mtxs "$MTXS" --arg dk "$DK" '
-              (if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
-              | (if .dependencies["@sap/cds-dk"]   then .dependencies["@sap/cds-dk"]   = $dk   else . end)
-            ' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
-          done
-
       - name: Install MBT ⚙️
         run: |
             echo "🔧 Installing MBT..."
diff --git a/.github/workflows/multiTenant_deploy_and_Integration_test.yml b/.github/workflows/multiTenant_deploy_and_Integration_test.yml
index 59c3f65b..1aac12e5 100644
--- a/.github/workflows/multiTenant_deploy_and_Integration_test.yml
+++ b/.github/workflows/multiTenant_deploy_and_Integration_test.yml
@@ -43,35 +43,6 @@ jobs:
         with:
           node-version: '20' # Ensure to use at least version 18
 
-      - name: Setup npm registry and pin SAP tarballs 📦
-        env:
-          NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-          SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
-          SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
-        run: |
-          set +x
-          echo "::add-mask::$NPM_AUTH_TOKEN"
-          echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
-          echo "::add-mask::$SAP_CDS_DK_TARBALL"
-
-          MTXS="$SAP_CDS_MTXS_TARBALL"
-          DK="$SAP_CDS_DK_TARBALL"
-          TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
-
-          for dir in \
-            "app/multi-tenant/central-space/cloud-cap-samples-java" \
-            "app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar"; do
-
-            printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
-              "$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
-
-            tmp=$(mktemp)
-            jq --arg mtxs "$MTXS" --arg dk "$DK" '
-              (if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
-              | (if .dependencies["@sap/cds-dk"]   then .dependencies["@sap/cds-dk"]   = $dk   else . end)
-            ' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
-          done
-
       - name: Install MBT ⚙️
         run: |
             echo "🔧 Installing MBT..."
diff --git a/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml b/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml
index 180d14c0..a4742b63 100644
--- a/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml
+++ b/.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml
@@ -43,35 +43,6 @@ jobs:
         with:
           node-version: '20' # Ensure to use at least version 18
 
-      - name: Setup npm registry and pin SAP tarballs 📦
-        env:
-          NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-          SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
-          SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
-        run: |
-          set +x
-          echo "::add-mask::$NPM_AUTH_TOKEN"
-          echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
-          echo "::add-mask::$SAP_CDS_DK_TARBALL"
-
-          MTXS="$SAP_CDS_MTXS_TARBALL"
-          DK="$SAP_CDS_DK_TARBALL"
-          TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
-
-          for dir in \
-            "app/multi-tenant/central-space/cloud-cap-samples-java" \
-            "app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar"; do
-
-            printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
-              "$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
-
-            tmp=$(mktemp)
-            jq --arg mtxs "$MTXS" --arg dk "$DK" '
-              (if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
-              | (if .dependencies["@sap/cds-dk"]   then .dependencies["@sap/cds-dk"]   = $dk   else . end)
-            ' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
-          done
-
       - name: Install MBT ⚙️
         run: |
             echo "🔧 Installing MBT..."
diff --git a/app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml b/app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml
index 125460c5..6fdfffba 100644
--- a/app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml
+++ b/app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml
@@ -27,7 +27,7 @@
 		<cloud.sdk.version>5.12.0</cloud.sdk.version>
 		<xsuaa.version>3.5.0</xsuaa.version>
 		<cf-java-logging-support.version>3.8.3</cf-java-logging-support.version>
-		<cds.install-cdsdk.version>9.8.0</cds.install-cdsdk.version>
+		<cds.install-cdsdk.version>^9</cds.install-cdsdk.version>
 	</properties>
 
 	<modules>
diff --git a/app/multi-tenant/personal-space/cloud-cap-samples-java/pom.xml b/app/multi-tenant/personal-space/cloud-cap-samples-java/pom.xml
index c2c6df6a..6fdfffba 100644
--- a/app/multi-tenant/personal-space/cloud-cap-samples-java/pom.xml
+++ b/app/multi-tenant/personal-space/cloud-cap-samples-java/pom.xml
@@ -27,7 +27,7 @@
 		<cloud.sdk.version>5.12.0</cloud.sdk.version>
 		<xsuaa.version>3.5.0</xsuaa.version>
 		<cf-java-logging-support.version>3.8.3</cf-java-logging-support.version>
-		<cds.install-cdsdk.version>9.3.1</cds.install-cdsdk.version>
+		<cds.install-cdsdk.version>^9</cds.install-cdsdk.version>
 	</properties>
 
 	<modules>
diff --git a/app/single-tenant/central-space/demoapp/pom.xml b/app/single-tenant/central-space/demoapp/pom.xml
index 272527e3..e84476d1 100644
--- a/app/single-tenant/central-space/demoapp/pom.xml
+++ b/app/single-tenant/central-space/demoapp/pom.xml
@@ -19,7 +19,7 @@
 		<jdk.version>21</jdk.version>
 		<cds.services.version>4.1.1</cds.services.version>
 		<spring.boot.version>3.3.1</spring.boot.version>
-		<cds.install-cdsdk.version>8.0.2</cds.install-cdsdk.version>
+		<cds.install-cdsdk.version>^9</cds.install-cdsdk.version>
 
 		<cds.install-node.downloadUrl>https://nodejs.org/dist/</cds.install-node.downloadUrl>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/app/single-tenant/personal-space/demoapp/pom.xml b/app/single-tenant/personal-space/demoapp/pom.xml
index 272527e3..e84476d1 100644
--- a/app/single-tenant/personal-space/demoapp/pom.xml
+++ b/app/single-tenant/personal-space/demoapp/pom.xml
@@ -19,7 +19,7 @@
 		<jdk.version>21</jdk.version>
 		<cds.services.version>4.1.1</cds.services.version>
 		<spring.boot.version>3.3.1</spring.boot.version>
-		<cds.install-cdsdk.version>8.0.2</cds.install-cdsdk.version>
+		<cds.install-cdsdk.version>^9</cds.install-cdsdk.version>
 
 		<cds.install-node.downloadUrl>https://nodejs.org/dist/</cds.install-node.downloadUrl>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>