diff --git a/.github/workflows/run-integrationTests-dotnet.yaml b/.github/workflows/run-integrationTests-dotnet.yaml
index 5a01632..b59465d 100644
--- a/.github/workflows/run-integrationTests-dotnet.yaml
+++ b/.github/workflows/run-integrationTests-dotnet.yaml
@@ -1,4 +1,4 @@
-name: test-template-sdk-dotnet
+name: test-template-spacefx-client-dotnet
 on:
     workflow_call:
       inputs:
diff --git a/.github/workflows/sdk-dotnet-build.yaml b/.github/workflows/spacefx-client-dotnet-build.yaml
similarity index 95%
rename from .github/workflows/sdk-dotnet-build.yaml
rename to .github/workflows/spacefx-client-dotnet-build.yaml
index f42f5e7..219277b 100644
--- a/.github/workflows/sdk-dotnet-build.yaml
+++ b/.github/workflows/spacefx-client-dotnet-build.yaml
@@ -10,7 +10,7 @@ jobs:
       contents: read
       packages: write
 
-    uses: microsoft/azure-orbital-space-sdk-github-actions/.github/workflows/service-build.yml@main
+    uses: microsoft/azure-orbital-space-sdk-github-actions/.github/workflows/python-app-build.yml@main
     with:
       APP_PROJECT: ./src/spacesdk-client.csproj
       NUGET_PROJECT: ./src/spacesdk-client.csproj
@@ -30,7 +30,7 @@ jobs:
       contents: read
       packages: write
 
-    uses: microsoft/azure-orbital-space-sdk-github-actions/.github/workflows/service-build.yml@main
+    uses: microsoft/azure-orbital-space-sdk-github-actions/.github/workflows/python-app-build.yml@main
     with:
       APP_PROJECT: ./src/spacesdk-client.csproj
       NUGET_PROJECT: ./src/spacesdk-client.csproj
diff --git a/.github/workflows/test-spacefx-client.yaml b/.github/workflows/test-spacefx-client.yaml
new file mode 100644
index 0000000..7b390df
--- /dev/null
+++ b/.github/workflows/test-spacefx-client.yaml
@@ -0,0 +1,36 @@
+name: test-spacefx-client
+on: 
+    workflow_dispatch:
+    pull_request:
+      branches: [ main ]
+
+jobs:
+  test-spacefx-client-amd64:
+    permissions:
+      contents: read
+      issues: read
+      checks: write
+      pull-requests: write
+
+    uses: ./.github/workflows/run-integrationTests-dotnet.yaml
+    with:
+      WORKFLOW_AGENT: ubuntu-latest
+    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 }}
+
+  test-spacefx-client-arm64:
+    permissions:
+      contents: read
+      issues: read
+      checks: write
+      pull-requests: write
+
+    uses: ./.github/workflows/run-integrationTests-dotnet.yaml
+    with:
+      WORKFLOW_AGENT: spacesdk-ubuntu-2204LTS-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