diff --git a/.release-please-manifest.json b/.agent-release-manifest.json
similarity index 100%
rename from .release-please-manifest.json
rename to .agent-release-manifest.json
diff --git a/.github/workflows/build-and-release-agent.yml b/.github/workflows/build-and-release-agent.yml
index ee43668..183f254 100644
--- a/.github/workflows/build-and-release-agent.yml
+++ b/.github/workflows/build-and-release-agent.yml
@@ -32,8 +32,8 @@ jobs:
         id: release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          config-file: release-please-config.json
-          manifest-file: .release-please-manifest.json
+          config-file: agent-release-config.json
+          manifest-file: .agent-release-manifest.json
       - name: Print release outputs for debugging
         continue-on-error: true
         env:
diff --git a/.github/workflows/build-and-release-connect-app.yml b/.github/workflows/build-and-release-connect-app.yml
index 82493f1..3540215 100644
--- a/.github/workflows/build-and-release-connect-app.yml
+++ b/.github/workflows/build-and-release-connect-app.yml
@@ -1,4 +1,4 @@
-name: Connect - Build aarch64
+name: Build and Release Connect App
 on:
   push:
     branches:
@@ -24,15 +24,15 @@ jobs:
   release_please:
     runs-on: ubuntu-latest
     outputs:
-      tag_name: ${{ steps.release.outputs.tag_name }}
+      tag_name: ${{ steps.release.outputs['client/app--tag_name'] }}
       release_created: ${{ steps.release.outputs.releases_created }}
     steps:
       - uses: googleapis/release-please-action@v4
         id: release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          config-file: client/release-please-config.json
-          manifest-file: client/.release-please-manifest.json
+          config-file: client/app/connect-app-release-config.json
+          manifest-file: client/app/.connect-app-release-manifest.json
       - name: Print release outputs for debugging
         continue-on-error: true
         env:
@@ -42,21 +42,21 @@ jobs:
           echo "release created: $release_created"
   
   build:
-    name: Mecha connect app build
+    name: ${{ matrix.name }}
     needs: release_please
     if: ${{ needs.release_please.outputs.release_created == 'true' }}
     strategy:
       fail-fast: true
       matrix:
         include:
-          - name: Mecha Connect App
+          - name: Mecha Connect App (arm64)
             package: mecha-connect
             artifact: mecha-connect-aarch64-unknown-linux-gnu.tar.gz
             path: ./client/app
             runs_on: ubicloud-standard-2-arm
             arch: arm64
 
-          - name: Mecha Connect App
+          - name: Mecha Connect App (amd64)
             package: mecha-connect
             artifact: mecha-connect-x86_64-unknown-linux-gnu.tar.gz
             path: ./client/app
@@ -69,6 +69,10 @@ jobs:
       - name: Setup | Checkout
         uses: actions/checkout@v4
 
+      - name: Print all release outputs
+        run: |
+           echo "Release outputs: ${{ toJson(needs.release_please.outputs) }}"
+
       - name: install dependencies (ubuntu only)
         run: |
           sudo apt-get update
@@ -151,6 +155,7 @@ jobs:
             "Architectures": ["arm64", "amd64"],
             "Signing": {"Skip": true}
           }' ${{ env.MECHANIX_APTLY_SERVER_ENDPOINT }}/api/publish/s3:${{env.MECHANIX_APTLY_S3_PUBLISH_ENDPOINT}}:/${{ env.MECHANIX_APTLY_DEB_REPOSITORY_DISTRO }}
+      
       - name: Prepare artifacts [${{ matrix.package }}]
         run: |
           mkdir build
diff --git a/release-please-config.json b/agent-release-config.json
similarity index 100%
rename from release-please-config.json
rename to agent-release-config.json
diff --git a/client/.release-please-manifest.json b/client/.release-please-manifest.json
deleted file mode 100644
index f992e11..0000000
--- a/client/.release-please-manifest.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "client": "0.1.0"
-}
\ No newline at end of file
diff --git a/client/app/.connect-app-release-manifest.json b/client/app/.connect-app-release-manifest.json
new file mode 100644
index 0000000..42735a5
--- /dev/null
+++ b/client/app/.connect-app-release-manifest.json
@@ -0,0 +1,3 @@
+{
+    "client/app": "0.1.0"
+}
\ No newline at end of file
diff --git a/client/app/connect-app-release-config.json b/client/app/connect-app-release-config.json
new file mode 100644
index 0000000..141c89b
--- /dev/null
+++ b/client/app/connect-app-release-config.json
@@ -0,0 +1,14 @@
+{
+   "include-component-in-tag": true,
+   "include-v-in-tag": true,
+   "tag-separator": "@",
+   "separate-pull-requests": true,
+   "packages": {
+     "client/app": {
+       "release-type": "rust",
+       "changelog-path": "client/app/CHANGELOG.md"
+     }
+   },
+   "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
+ }
+ 
\ No newline at end of file
diff --git a/client/release-please-config.json b/client/release-please-config.json
deleted file mode 100644
index b7d733a..0000000
--- a/client/release-please-config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "include-component-in-tag": true,
-    "include-v-in-tag": true,
-    "tag-separator": "@",
-    "separate-pull-requests": true,
-    "packages": {
-    "client": { 
-      "release-type": "rust",
-      "path": "client/app",
-      "changelog-path": "app/CHANGELOG.md"
-    }
-  },
-    "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
-  }
-  
\ No newline at end of file