diff --git a/plugins/plugin-tools/src/config.spec.ts b/plugins/plugin-tools/src/config.spec.ts
index 9ee3b81..0168a3c 100644
--- a/plugins/plugin-tools/src/config.spec.ts
+++ b/plugins/plugin-tools/src/config.spec.ts
@@ -262,6 +262,21 @@ describe('config', () => {
     });
 
     describe('no container', () => {
+      it('returns orbiter ID from orbiter.ids[mode] if set', async () => {
+        vi.spyOn(configLoader, 'junoConfigExist').mockResolvedValue(true);
+
+        vi.spyOn(configLoader, 'readJunoConfig').mockResolvedValue({
+          orbiter: {
+            ids: {
+              production: 'orb-prod-id'
+            }
+          }
+        } as unknown as JunoConfig);
+
+        const id = await orbiterId({params: {container: false}, mode: 'production'});
+        expect(id).toBe('orb-prod-id');
+      });
+
       it('reads config and returns orbiter ID', async () => {
         vi.spyOn(configLoader, 'junoConfigExist').mockResolvedValue(true);
 
diff --git a/plugins/plugin-tools/src/config.ts b/plugins/plugin-tools/src/config.ts
index 7651356..64aaadf 100644
--- a/plugins/plugin-tools/src/config.ts
+++ b/plugins/plugin-tools/src/config.ts
@@ -113,12 +113,12 @@ const containerOrbiterId = async ({mode}: ConfigArgs): Promise<string | undefine
   return ids?.[MODE_DEVELOPMENT];
 };
 
-const junoConfigOrbiterId = async (args: ConfigArgs): Promise<string | undefined> => {
+const junoConfigOrbiterId = async ({mode}: ConfigArgs): Promise<string | undefined> => {
   await assertJunoConfig();
 
-  const config = await readJunoConfig(args);
+  const config = await readJunoConfig({mode});
 
-  return config?.orbiter?.id ?? config?.orbiter?.orbiterId;
+  return config?.orbiter?.ids?.[mode] ?? config?.orbiter?.id ?? config?.orbiter?.orbiterId;
 };
 
 export const icpIds = (): IcpIds | undefined => ({