diff --git a/packages/cli/src/ui/hooks/useApprovalModeIndicator.ts b/packages/cli/src/ui/hooks/useApprovalModeIndicator.ts
index dfb1420303..2f6fa8d20b 100644
--- a/packages/cli/src/ui/hooks/useApprovalModeIndicator.ts
+++ b/packages/cli/src/ui/hooks/useApprovalModeIndicator.ts
@@ -44,7 +44,7 @@ export function useApprovalModeIndicator({
             addItem(
               {
                 type: MessageType.WARNING,
-                text: 'You cannot enter YOLO mode since it is disabled in your settings.',
+                text: 'You cannot enter YOLO mode since it is disabled by your admin.',
               },
               Date.now(),
             );
diff --git a/packages/core/src/code_assist/admin/admin_controls.ts b/packages/core/src/code_assist/admin/admin_controls.ts
index e2feaf9414..1cea043707 100644
--- a/packages/core/src/code_assist/admin/admin_controls.ts
+++ b/packages/core/src/code_assist/admin/admin_controls.ts
@@ -119,7 +119,7 @@ function startAdminControlsPolling(
         debugLogger.error('Failed to poll admin controls: ', e);
       }
     },
-    5 * 60 * 1000,
+    1 * 60 * 1000,
   ); // 5 minutes
 }
 
diff --git a/packages/core/src/code_assist/server.ts b/packages/core/src/code_assist/server.ts
index bf57bc55b7..04d7b35e8f 100644
--- a/packages/core/src/code_assist/server.ts
+++ b/packages/core/src/code_assist/server.ts
@@ -59,7 +59,8 @@ export interface HttpOptions {
   headers?: Record<string, string>;
 }
 
-export const CODE_ASSIST_ENDPOINT = 'https://cloudcode-pa.googleapis.com';
+export const CODE_ASSIST_ENDPOINT =
+  'https://staging-cloudcode-pa.sandbox.googleapis.com';
 export const CODE_ASSIST_API_VERSION = 'v1internal';
 
 export class CodeAssistServer implements ContentGenerator {