diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index c4ae10bb..4b1cde5a 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -26,22 +26,6 @@ jobs:
           ref: fire-egg-dev
           path: all-examples/cpp/aws-sdk-cpp/
 
-      - name: Checkout .NET V3 code
-        uses: actions/checkout@v5
-        with:
-          token: ${{ secrets.PAT_FOR_DOTNET }}
-          repository: aws/private-amazon-s3-encryption-client-dotnet-staging
-          ref: rishav/key-commitment 
-          path: all-examples/net/v3/s3ec-v3-local
-
-      - name: Checkout .NET V4 code
-        uses: actions/checkout@v5
-        with:
-          token: ${{ secrets.PAT_FOR_DOTNET }}
-          repository: aws/private-amazon-s3-encryption-client-dotnet-staging
-          ref: s3ec-v4-WIP
-          path: all-examples/net/v4/s3ec-v4-local
-
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
diff --git a/.gitmodules b/.gitmodules
index 3adca9cb..a88a83f9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,11 +58,3 @@
 [submodule "test-server/cpp-v2-server/aws-sdk-cpp"]
 	path = test-server/cpp-v2-server/aws-sdk-cpp
 	url = git@github.com:awslabs/aws-sdk-cpp-staging.git
-[submodule "all-examples/net/v4/s3ec-v4-local"]
-	path = all-examples/net/v4/s3ec-v4-local
-	url = https://github.com/aws/private-amazon-s3-encryption-client-dotnet-staging.git
-	branch = s3ec-v4-WIP
-[submodule "all-examples/net/v3/s3ec-v3-local"]
-	path = all-examples/net/v3/s3ec-v3-local
-	url = https://github.com/aws/private-amazon-s3-encryption-client-dotnet-staging.git
-	branch = rishav/key-commitment
diff --git a/all-examples/net/v3/s3ec-v3-local b/all-examples/net/v3/s3ec-v3-local
deleted file mode 160000
index ca1149d9..00000000
--- a/all-examples/net/v3/s3ec-v3-local
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ca1149d9b423591c09d35caa649b3f6846e511a6
diff --git a/all-examples/net/v3/s3ec-v3-local b/all-examples/net/v3/s3ec-v3-local
new file mode 120000
index 00000000..a2d8df44
--- /dev/null
+++ b/all-examples/net/v3/s3ec-v3-local
@@ -0,0 +1 @@
+../../../test-server/net-v3-transition-server/s3ec-v3-transition-branch
\ No newline at end of file
diff --git a/all-examples/net/v4/s3ec-v4-local b/all-examples/net/v4/s3ec-v4-local
deleted file mode 160000
index 691d22a5..00000000
--- a/all-examples/net/v4/s3ec-v4-local
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 691d22a504184fd71f2dae7fd354bd669b58cc07
diff --git a/all-examples/net/v4/s3ec-v4-local b/all-examples/net/v4/s3ec-v4-local
new file mode 120000
index 00000000..371b1a90
--- /dev/null
+++ b/all-examples/net/v4/s3ec-v4-local
@@ -0,0 +1 @@
+../../../test-server/net-v4-server/s3ec-net-v4-improved
\ No newline at end of file