diff --git a/go/tunnels/manager.go b/go/tunnels/manager.go
index 4d1ae05f..0cfdc3b7 100644
--- a/go/tunnels/manager.go
+++ b/go/tunnels/manager.go
@@ -25,14 +25,14 @@ var ServiceProperties = TunnelServiceProperties{
 
 var PpeServiceProperties = TunnelServiceProperties{
 	ServiceURI:           fmt.Sprintf("https://%s/", ppeDnsName),
-	ServiceAppID:         nonProdFirstPartyAppID,
+	ServiceAppID:         ppeFirstPartyAppID,
 	ServiceInternalAppID: ppeThirdPartyAppID,
 	GitHubAppClientID:    nonProdGitHubAppClientID,
 }
 
 var DevServiceProperties = TunnelServiceProperties{
 	ServiceURI:           fmt.Sprintf("https://%s/", devDnsName),
-	ServiceAppID:         nonProdFirstPartyAppID,
+	ServiceAppID:         devFirstPartyAppID,
 	ServiceInternalAppID: devThirdPartyAppID,
 	GitHubAppClientID:    nonProdGitHubAppClientID,
 }
diff --git a/java/src/main/java/com/microsoft/tunnels/contracts/TunnelServicePropertiesStatics.java b/java/src/main/java/com/microsoft/tunnels/contracts/TunnelServicePropertiesStatics.java
index 7366dc6f..1ce3c514 100644
--- a/java/src/main/java/com/microsoft/tunnels/contracts/TunnelServicePropertiesStatics.java
+++ b/java/src/main/java/com/microsoft/tunnels/contracts/TunnelServicePropertiesStatics.java
@@ -22,7 +22,7 @@ class TunnelServicePropertiesStatics {
    */
   static final TunnelServiceProperties staging = new TunnelServiceProperties(
       "https://" + TunnelServiceProperties.ppeDnsName + "/",
-      TunnelServiceProperties.nonProdFirstPartyAppId,
+      TunnelServiceProperties.ppeFirstPartyAppId,
       TunnelServiceProperties.ppeThirdPartyAppId,
       TunnelServiceProperties.nonProdGitHubAppClientId);
 
@@ -31,7 +31,7 @@ class TunnelServicePropertiesStatics {
    */
   static final TunnelServiceProperties development = new TunnelServiceProperties(
       "https://" + TunnelServiceProperties.devDnsName + "/",
-      TunnelServiceProperties.nonProdFirstPartyAppId,
+      TunnelServiceProperties.devFirstPartyAppId,
       TunnelServiceProperties.devThirdPartyAppId,
       TunnelServiceProperties.nonProdGitHubAppClientId);
 
diff --git a/ts/src/contracts/tunnelServicePropertiesStatics.ts b/ts/src/contracts/tunnelServicePropertiesStatics.ts
index da15374d..2f715fcc 100644
--- a/ts/src/contracts/tunnelServicePropertiesStatics.ts
+++ b/ts/src/contracts/tunnelServicePropertiesStatics.ts
@@ -4,7 +4,8 @@
 import {
     TunnelServiceProperties as ITunnelServiceProperties,
     prodFirstPartyAppId,
-    nonProdFirstPartyAppId,
+    ppeFirstPartyAppId,
+    devFirstPartyAppId,
     prodThirdPartyAppId,
     ppeThirdPartyAppId,
     devThirdPartyAppId,
@@ -30,7 +31,7 @@ export const production = <ITunnelServiceProperties>{
  */
 export const staging = <ITunnelServiceProperties>{
     serviceUri: `https://${ppeDnsName}/`,
-    serviceAppId: nonProdFirstPartyAppId,
+    serviceAppId: ppeFirstPartyAppId,
     serviceInternalAppId: ppeThirdPartyAppId,
     gitHubAppClientId: nonProdGitHubAppClientId,
 };
@@ -40,7 +41,7 @@ export const staging = <ITunnelServiceProperties>{
  */
 export const development = <ITunnelServiceProperties>{
     serviceUri: `https://${devDnsName}/`,
-    serviceAppId: nonProdFirstPartyAppId,
+    serviceAppId: devFirstPartyAppId,
     serviceInternalAppId: devThirdPartyAppId,
     gitHubAppClientId: nonProdGitHubAppClientId,
 };