diff --git a/examples/fabric-admin/scripts/run_fabric_sync.sh b/examples/fabric-admin/scripts/run_fabric_sync.sh
index 8c820d1..957fe5f 100755
--- a/examples/fabric-admin/scripts/run_fabric_sync.sh
+++ b/examples/fabric-admin/scripts/run_fabric_sync.sh
@@ -7,14 +7,14 @@
 DEFAULT_ADMIN_CHOICES=(
     "./fabric-admin"
     "out/debug/standalone/fabric-admin"
-    "out/linux-x64-fabric-admin/fabric-admin"
-    "out/darwin-arm64-fabric-admin/fabric-admin"
+    "out/linux-x64-fabric-admin-rpc/fabric-admin"
+    "out/darwin-arm64-fabric-admin-rpc/fabric-admin"
 )
 DEFAULT_BRIDGE_CHOICES=(
     "./fabric-bridge-app"
     "out/debug/standalone/fabric-bridge-app"
-    "out/linux-x64-fabric-bridge-app/fabric-bridge-app"
-    "out/darwin-arm64-fabric-bridge-app/fabric-bridge-app"
+    "out/linux-x64-fabric-bridge-rpc/fabric-bridge-app"
+    "out/darwin-arm64-fabric-bridge-rpc/fabric-bridge-app"
 )
 FABRIC_ADMIN_LOG="/tmp/fabric_admin.log"
 FABRIC_BRIDGE_APP_LOG="/tmp/fabric_bridge_app.log"
diff --git a/examples/fabric-admin/scripts/stop_fabric_sync.sh b/examples/fabric-admin/scripts/stop_fabric_sync.sh
index e947c89..faa5c79 100755
--- a/examples/fabric-admin/scripts/stop_fabric_sync.sh
+++ b/examples/fabric-admin/scripts/stop_fabric_sync.sh
@@ -20,5 +20,5 @@
 fi
 
 # Remove /tmp/chip_* files and directories
-sudo rm -rf /tmp/chip_*
+rm -rf /tmp/chip_*
 echo "Removed /tmp/chip_* files and directories"
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index 8ab6e2c..37ede96 100755
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -128,8 +128,8 @@
         TargetPart('tv-app', app=HostApp.TV_APP),
         TargetPart('tv-casting-app', app=HostApp.TV_CASTING),
         TargetPart('bridge', app=HostApp.BRIDGE),
-        TargetPart('fabric-admin', app=HostApp.FABRIC_ADMIN),
-        TargetPart('fabric-bridge', app=HostApp.FABRIC_BRIDGE),
+        TargetPart('fabric-admin', app=HostApp.FABRIC_ADMIN).OnlyIfRe("-rpc"),
+        TargetPart('fabric-bridge', app=HostApp.FABRIC_BRIDGE).OnlyIfRe("-rpc"),
         TargetPart('tests', app=HostApp.TESTS),
         TargetPart('chip-cert', app=HostApp.CERT_TOOL),
         TargetPart('address-resolve-tool', app=HostApp.ADDRESS_RESOLVE),