diff --git a/.github/workflows/spacefx-client-build.yaml b/.github/workflows/spacefx-client-build.yaml
new file mode 100644
index 0000000..24a4abf
--- /dev/null
+++ b/.github/workflows/spacefx-client-build.yaml
@@ -0,0 +1,58 @@
+name: spacefx-client-build
+
+on: 
+    workflow_dispatch:
+    push:
+        branches:
+         - main
+
+jobs:
+  build-spacefx-client-amd64:
+    permissions:
+      contents: read
+      packages: write
+
+    uses: microsoft/azure-orbital-space-sdk-github-actions/.github/workflows/client-build.yaml@main
+    with:
+      DOTNET_APP_PROJECT: ./src/spacesdk-client.csproj
+      DOTNET_NUGET_PROJECT: ./src/spacesdk-client.csproj
+      DOTNET_OUTPUT_DIR: /var/spacedev/tmp/spacesdk-client
+      DOTNET_NUGET_STAGING_DIRECTORY: /var/spacedev/nuget/spacesdk-client
+      DOTNET_NUGET_FILE_PREFIX: Microsoft.Azure.SpaceSDK.Client
+      PYTHON_APP_PROJECT:  spacefx
+      PYTHON_OUTPUT_DIR: /var/spacedev/tmp/spacesdk-client
+      PYTHON_WHEEL_STAGING_DIRECTORY: /var/spacedev/wheel/microsoftazurespacefx
+      PYTHON_WHEEL_FILE_PREFIX: microsoftazurespacefx
+      BUILD_PYTHON_WHEEL: true
+      ANNOTATION: azure-orbital-space-sdk-client.yaml
+      WORKFLOW_AGENT: ubuntu-latest
+      ARCHITECTURE: amd64
+    secrets:
+      GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
+      GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
+      SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}
+
+  build-spacefx-client-dotnet-arm64:
+    permissions:
+      contents: read
+      packages: write
+
+    uses: microsoft/azure-orbital-space-sdk-github-actions/.github/workflows/client-build.yaml@main
+    with:
+      DOTNET_APP_PROJECT: ./src/spacesdk-client.csproj
+      DOTNET_NUGET_PROJECT: ./src/spacesdk-client.csproj
+      DOTNET_OUTPUT_DIR: /var/spacedev/tmp/spacesdk-client
+      DOTNET_NUGET_STAGING_DIRECTORY: /var/spacedev/nuget/spacesdk-client
+      DOTNET_NUGET_FILE_PREFIX: Microsoft.Azure.SpaceSDK.Client
+      PYTHON_APP_PROJECT:  spacefx
+      PYTHON_OUTPUT_DIR: /var/spacedev/tmp/spacesdk-client
+      PYTHON_WHEEL_STAGING_DIRECTORY: /var/spacedev/wheel/microsoftazurespacefx
+      PYTHON_WHEEL_FILE_PREFIX: microsoftazurespacefx
+      BUILD_PYTHON_WHEEL: true
+      ANNOTATION: azure-orbital-space-sdk-client.yaml
+      WORKFLOW_AGENT: spacesdk-ubuntu-2204LTS-arm64
+      ARCHITECTURE: arm64
+    secrets:
+      GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
+      GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
+      SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}
\ No newline at end of file
diff --git a/.github/workflows/spacefx-client-dotnet-build.yaml b/.github/workflows/spacefx-client-dotnet-build.yaml
deleted file mode 100644
index 15b0f0a..0000000
--- a/.github/workflows/spacefx-client-dotnet-build.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: spacefx-client-dotnet-build
-
-on: 
-    workflow_dispatch:
-    push:
-        branches:
-         - main
-
-jobs:
-  build-spacefx-client-dotnet-amd64:
-    permissions:
-      contents: read
-      packages: write
-
-    uses: microsoft/azure-orbital-space-sdk-github-actions/.github/workflows/service-build.yml@main
-    with:
-      APP_PROJECT: ./src/spacesdk-client.csproj
-      NUGET_PROJECT: ./src/spacesdk-client.csproj
-      OUTPUT_DIR: /var/spacedev/tmp/spacesdk-client
-      NUGET_STAGING_DIRECTORY: /var/spacedev/nuget/spacesdk-client
-      NUGET_FILE_PREFIX: Microsoft.Azure.SpaceSDK.Client
-      ANNOTATION: azure-orbital-space-sdk-client.yaml
-      WORKFLOW_AGENT: ubuntu-latest
-      ARCHITECTURE: amd64
-    secrets:
-      GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
-      GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
-      SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}
-
-  build-spacefx-client-dotnet-arm64:
-    permissions:
-      contents: read
-      packages: write
-
-    uses: microsoft/azure-orbital-space-sdk-github-actions/.github/workflows/service-build.yml@main
-    with:
-      APP_PROJECT: ./src/spacesdk-client.csproj
-      NUGET_PROJECT: ./src/spacesdk-client.csproj
-      OUTPUT_DIR: /var/spacedev/tmp/spacesdk-client
-      NUGET_STAGING_DIRECTORY: /var/spacedev/nuget/spacesdk-client
-      NUGET_FILE_PREFIX: Microsoft.Azure.SpaceSDK.Client
-      ANNOTATION: azure-orbital-space-sdk-client.yaml
-      WORKFLOW_AGENT: spacesdk-ubuntu-2204LTS-arm64
-      ARCHITECTURE: arm64
-    secrets:
-      GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
-      GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
-      SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}
\ No newline at end of file
diff --git a/.github/workflows/spacefx-client-python-build.yaml b/.github/workflows/spacefx-client-python-build.yaml
deleted file mode 100644
index 73fd3b6..0000000
--- a/.github/workflows/spacefx-client-python-build.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: spacfx-client-python-build
-
-on: 
-    workflow_dispatch:
-    push:
-        branches:
-         - main
-
-jobs:
-  build-spcaefx-client-python-amd64:
-    permissions:
-      contents: read
-      packages: write
-
-    uses: microsoft/azure-orbital-space-sdk-github-actions/.github/workflows/python-app-build.yaml@main
-    with:
-      APP_PROJECT:  spacefx
-      OUTPUT_DIR: /var/spacedev/tmp/spacesdk-client
-      WHEEL_STAGING_DIRECTORY: /var/spacedev/wheel/microsoftazurespacefx
-      WHEEL_FILE_PREFIX: microsoftazurespacefx
-      ANNOTATION: azure-orbital-space-sdk-client.yaml
-      WORKFLOW_AGENT: ubuntu-latest
-      ARCHITECTURE: amd64
-      BUILD_PYTHON_WHEEL: true
-    secrets:
-      GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
-      GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
-      SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}
\ No newline at end of file
diff --git a/README.md b/README.md
index 4fbe358..988cd64 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 # Azure Orbital Space SDK - Client Libraries
 
-[![platform-mts-build](https://github.com/microsoft/azure-orbital-space-sdk-platform-mts/actions/workflows/platform-mts-build-publish.yaml/badge.svg)](https://github.com/microsoft/azure-orbital-space-sdk-platform-mts/actions/workflows/platform-mts-build-publish.yaml)
-
-[![test-platform-mts](https://github.com/microsoft/azure-orbital-space-sdk-platform-mts/actions/workflows/platform-mts-test.yaml/badge.svg)](https://github.com/microsoft/azure-orbital-space-sdk-platform-mts/actions/workflows/platform-mts-test.yaml)
+[![spacefx-client-build](https://github.com/microsoft/azure-orbital-space-sdk-client/actions/workflows/spacefx-client-build.yaml/badge.svg)](https://github.com/microsoft/azure-orbital-space-sdk-client/actions/workflows/spacefx-client-build.yaml)
 
 This repository hosts the DotNet and Python client libraries used by Payload Apps to interact with the Microsoft Azure Orbital Space SDK