diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index 6dae786d62..f9753a3677 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -105,13 +105,12 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libgdiplus
 
-      - name: Workaround StrawberryShake Issues By removing Preinstalled NET 8 SDK
-        run: sudo rm -rf /usr/share/dotnet/sdk/*
-
       - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: ${{ env.TGS_DOTNET_VERSION }}.0.x
+          dotnet-version: |
+            ${{ env.TGS_DOTNET_VERSION }}.0.x
+            ${{ env.OD_DOTNET_VERSION }}.0.x
           dotnet-quality: ${{ env.TGS_DOTNET_QUALITY }}
 
       - name: Setup Node.JS
@@ -479,13 +478,12 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y -o APT::Immediate-Configure=0 libc6-i386 libstdc++6:i386 libgcc-s1:i386 libgdiplus
 
-      - name: Workaround StrawberryShake Issues By removing Preinstalled NET 8 SDK
-        run: sudo rm -rf /usr/share/dotnet/sdk/*
-
       - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: ${{ env.TGS_DOTNET_VERSION }}.0.x
+          dotnet-version: |
+            ${{ env.TGS_DOTNET_VERSION }}.0.x
+            ${{ env.OD_DOTNET_VERSION }}.0.x
           dotnet-quality: ${{ env.TGS_DOTNET_QUALITY }}
 
       - name: Setup Node.JS
@@ -552,7 +550,9 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: ${{ env.TGS_DOTNET_VERSION }}.0.x
+          dotnet-version: |
+            ${{ env.TGS_DOTNET_VERSION }}.0.x
+            ${{ env.OD_DOTNET_VERSION }}.0.x
           dotnet-quality: ${{ env.TGS_DOTNET_QUALITY }}
 
       - name: Setup Node.JS
@@ -883,9 +883,6 @@ jobs:
       TGS_TELEMETRY_KEY_FILE: /tmp/tgs_telemetry_key.txt
     runs-on: ubuntu-latest
     steps:
-      - name: Workaround StrawberryShake Issues By removing Preinstalled NET 8 SDK
-        run: sudo rm -rf /usr/share/dotnet/sdk/*
-
       - name: Setup dotnet (TGS)
         uses: actions/setup-dotnet@v4
         with:
@@ -1340,13 +1337,12 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y dotnet-sdk-${{ env.TGS_DOTNET_VERSION }}.0
 
-      - name: Workaround StrawberryShake Issues By removing Preinstalled NET 8 SDK
-        run: sudo rm -rf /usr/share/dotnet/sdk/*
-
       - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: ${{ env.TGS_DOTNET_VERSION }}.0.x
+          dotnet-version: |
+            ${{ env.TGS_DOTNET_VERSION }}.0.x
+            ${{ env.OD_DOTNET_VERSION }}.0.x
           dotnet-quality: ${{ env.TGS_DOTNET_QUALITY }}
 
       - name: Override /usr/bin/dotnet
diff --git a/v7-release-checklist.md b/v7-release-checklist.md
index fc86effbad..915715a894 100644
--- a/v7-release-checklist.md
+++ b/v7-release-checklist.md
@@ -4,4 +4,4 @@
 - [ ] Update CI dotnet version to ga
 - [ ] Disable `TgsNetPreviewBuild` in Version.props
 - [ ] Fix dependencies in debian build-package.sh and control
-- [ ] Remove SDK uninstall steps in ci-pipeline.yml
+- [ ] Remove OD SDK install steps for unit tests, codeql, and deb build in ci-pipeline.yml