diff --git a/src/frontend/src/lib/components/modals/auth/AuthConfigModal.svelte b/src/frontend/src/lib/components/modals/auth/AuthConfigModal.svelte
index 1fb76564f1..63c4cbafac 100644
--- a/src/frontend/src/lib/components/modals/auth/AuthConfigModal.svelte
+++ b/src/frontend/src/lib/components/modals/auth/AuthConfigModal.svelte
@@ -3,8 +3,8 @@
 	import type { PrincipalText } from '@dfinity/zod-schemas';
 	import type { Principal } from '@icp-sdk/core/principal';
 	import AuthConfigFormCore from '$lib/components/satellites/auth/AuthConfigFormCore.svelte';
-	import AuthConfigFormGoogle from '$lib/components/satellites/auth/AuthConfigFormGoogle.svelte';
 	import AuthConfigFormII from '$lib/components/satellites/auth/AuthConfigFormII.svelte';
+	import AuthConfigFormOpenId from '$lib/components/satellites/auth/AuthConfigFormOpenId.svelte';
 	import Modal from '$lib/components/ui/Modal.svelte';
 	import SpinnerModal from '$lib/components/ui/SpinnerModal.svelte';
 	import { authIdentity } from '$lib/derived/auth.derived';
@@ -34,10 +34,12 @@
 
 	let rule = $derived('core' in detail ? detail.core.rule : undefined);
 
-	let edit = $derived<'core' | 'internet_identity' | 'google'>(
-		'core' in detail ? 'core' : 'internet_identity' in detail ? 'internet_identity' : 'google'
+	let edit = $derived<'core' | 'internet_identity' | 'openid'>(
+		'core' in detail ? 'core' : 'internet_identity' in detail ? 'internet_identity' : 'openid'
 	);
 
+	let openidProvider = $derived('openid' in detail ? detail.openid.provider : null);
+
 	let config = $derived(detail.config);
 
 	// Core rules
@@ -48,10 +50,10 @@
 	let selectedDerivationOrigin = $state<URL | undefined>(undefined);
 	let externalAlternativeOrigins = $state('');
 
-	// Google
-	let googleClientId = $state<string | undefined>(undefined);
-	let googleMaxTimeToLive = $state<bigint | undefined>(undefined);
-	let googleAllowedTargets = $state<PrincipalText[] | null | undefined>(undefined);
+	// OpenId (Google and GitHub)
+	let openidClientId = $state<string | undefined>(undefined);
+	let openidMaxTimeToLive = $state<bigint | undefined>(undefined);
+	let openidAllowedTargets = $state<PrincipalText[] | null | undefined>(undefined);
 
 	let step: 'init' | 'in_progress' | 'ready' | 'error' = $state('init');
 
@@ -76,12 +78,13 @@
 				});
 			}
 
-			if (edit === 'google') {
+			if (edit === 'openid') {
 				return updateAuthConfigGoogle({
 					...commonPayload,
-					clientId: googleClientId,
-					maxTimeToLive: googleMaxTimeToLive,
-					allowedTargets: $state.snapshot(googleAllowedTargets)
+					provider: openidProvider,
+					clientId: openidClientId,
+					maxTimeToLive: openidMaxTimeToLive,
+					allowedTargets: $state.snapshot(openidAllowedTargets)
 				});
 			}
 
@@ -95,9 +98,10 @@
 
 		const { success } = await update();
 
-		if (isSkylab() && edit === 'google') {
+		if (isSkylab() && nonNullish(openidProvider)) {
 			await emulatorToggleOpenIdMonitoring({
-				enable: nonNullish(googleClientId)
+				enable: nonNullish(openidClientId),
+				provider: openidProvider
 			});
 		}
 
@@ -124,14 +128,15 @@
 		<SpinnerModal>
 			<p>{$i18n.core.updating_configuration}</p>
 		</SpinnerModal>
-	{:else if edit === 'google'}
-		<AuthConfigFormGoogle
+	{:else if edit === 'openid' && nonNullish(openidProvider)}
+		<AuthConfigFormOpenId
 			{config}
 			onsubmit={handleSubmit}
+			provider={openidProvider}
 			{satellite}
-			bind:clientId={googleClientId}
-			bind:maxTimeToLive={googleMaxTimeToLive}
-			bind:allowedTargets={googleAllowedTargets}
+			bind:clientId={openidClientId}
+			bind:maxTimeToLive={openidMaxTimeToLive}
+			bind:allowedTargets={openidAllowedTargets}
 		/>
 	{:else if edit === 'internet_identity'}
 		<AuthConfigFormII
diff --git a/src/frontend/src/lib/components/satellites/auth/AuthConfigFormGoogle.svelte b/src/frontend/src/lib/components/satellites/auth/AuthConfigFormOpenId.svelte
similarity index 83%
rename from src/frontend/src/lib/components/satellites/auth/AuthConfigFormGoogle.svelte
rename to src/frontend/src/lib/components/satellites/auth/AuthConfigFormOpenId.svelte
index 8528eaa368..cf3ad5cddd 100644
--- a/src/frontend/src/lib/components/satellites/auth/AuthConfigFormGoogle.svelte
+++ b/src/frontend/src/lib/components/satellites/auth/AuthConfigFormOpenId.svelte
@@ -4,7 +4,7 @@
 	import { onMount } from 'svelte';
 	import { fade } from 'svelte/transition';
 	import type { SatelliteDid } from '$declarations';
-	import AuthConfigFormGoogleOptions from '$lib/components/satellites/auth/AuthConfigFormGoogleOptions.svelte';
+	import AuthConfigFormOpenIdOptions from '$lib/components/satellites/auth/AuthConfigFormOpenIdOptions.svelte';
 	import Input from '$lib/components/ui/Input.svelte';
 	import Value from '$lib/components/ui/Value.svelte';
 	import Warning from '$lib/components/ui/Warning.svelte';
@@ -22,8 +22,10 @@
 	} from '$lib/constants/duration.constants';
 	import { isBusy } from '$lib/derived/app/busy.derived';
 	import { i18n } from '$lib/stores/app/i18n.store';
+	import type { OpenIdAuthProvider } from '$lib/types/auth';
 	import type { Satellite } from '$lib/types/satellite';
-	import { i18nFormat } from '$lib/utils/i18n.utils';
+	import { findProviderGitHub, findProviderGoogle } from '$lib/utils/auth.openid.utils';
+	import { i18nCapitalize, i18nFormat } from '$lib/utils/i18n.utils';
 
 	interface Props {
 		satellite: Satellite;
@@ -32,6 +34,7 @@
 		clientId: string | undefined;
 		maxTimeToLive: bigint | undefined;
 		allowedTargets: PrincipalText[] | null | undefined;
+		provider: OpenIdAuthProvider;
 	}
 
 	let {
@@ -40,15 +43,19 @@
 		config,
 		clientId = $bindable(undefined),
 		maxTimeToLive = $bindable(),
-		allowedTargets = $bindable(undefined)
+		allowedTargets = $bindable(undefined),
+		provider
 	}: Props = $props();
 
+	// svelte-ignore state_referenced_locally
+	let findProvider = $state(provider === 'github' ? findProviderGitHub : findProviderGoogle);
+
 	// svelte-ignore state_referenced_locally
 	let openid = $state(fromNullable(config?.openid ?? []));
-	let google = $state(openid?.providers.find(([key]) => 'Google' in key));
-	let providerData = $state(google?.[1]);
+	let openidProvider = $state(findProvider(openid));
+	let providerData = $state(openidProvider?.[1]);
 	let delegation = $state(fromNullable(providerData?.delegation ?? []));
-	let googleEnabled = $state(nonNullish(google));
+	let openidEnabled = $state(nonNullish(openidProvider));
 
 	// Client ID
 	let currentClientId = $state(providerData?.client_id);
@@ -89,17 +96,17 @@
 	let warnClientId = $derived(isEmptyString(clientId) && notEmptyString(currentClientId));
 </script>
 
-<h2>Google</h2>
+<h2>{provider}</h2>
 
 <p>
 	{i18nFormat(
-		googleEnabled
+		openidEnabled
 			? $i18n.authentication.edit_provider
 			: $i18n.authentication.edit_to_enable_provider,
 		[
 			{
 				placeholder: '{0}',
-				value: 'Google'
+				value: i18nCapitalize(provider)
 			}
 		]
 	)}
@@ -153,7 +160,7 @@
 			</Value>
 		</div>
 
-		<AuthConfigFormGoogleOptions {delegation} {satellite} bind:allowedTargets />
+		<AuthConfigFormOpenIdOptions {delegation} {satellite} bind:allowedTargets />
 
 		{#if warnClientId}
 			<div class="warn" in:fade>
@@ -166,3 +173,9 @@
 		{$i18n.core.submit}
 	</button>
 </form>
+
+<style lang="scss">
+	h2 {
+		text-transform: capitalize;
+	}
+</style>
diff --git a/src/frontend/src/lib/components/satellites/auth/AuthConfigFormGoogleOptions.svelte b/src/frontend/src/lib/components/satellites/auth/AuthConfigFormOpenIdOptions.svelte
similarity index 100%
rename from src/frontend/src/lib/components/satellites/auth/AuthConfigFormGoogleOptions.svelte
rename to src/frontend/src/lib/components/satellites/auth/AuthConfigFormOpenIdOptions.svelte
diff --git a/src/frontend/src/lib/components/satellites/auth/AuthConfigGoogle.svelte b/src/frontend/src/lib/components/satellites/auth/AuthConfigOpenId.svelte
similarity index 88%
rename from src/frontend/src/lib/components/satellites/auth/AuthConfigGoogle.svelte
rename to src/frontend/src/lib/components/satellites/auth/AuthConfigOpenId.svelte
index d3db2d4268..88c5c4164b 100644
--- a/src/frontend/src/lib/components/satellites/auth/AuthConfigGoogle.svelte
+++ b/src/frontend/src/lib/components/satellites/auth/AuthConfigOpenId.svelte
@@ -14,26 +14,31 @@
 		TWO_WEEKS_NS
 	} from '$lib/constants/duration.constants';
 	import { i18n } from '$lib/stores/app/i18n.store';
+	import type { OpenIdAuthProvider } from '$lib/types/auth';
 	import { AUTH_CONFIG_CONTEXT_KEY, type AuthConfigContext } from '$lib/types/auth.context';
 	import type { JunoModalEditAuthConfigDetailType } from '$lib/types/modal';
 	import type { Satellite } from '$lib/types/satellite';
+	import { findProviderGitHub, findProviderGoogle } from '$lib/utils/auth.openid.utils';
 	import { secondsToDuration } from '$lib/utils/date.utils';
 	import { i18nFormat } from '$lib/utils/i18n.utils';
 	import { satelliteName } from '$lib/utils/satellite.utils';
 
 	interface Props {
 		satellite: Satellite;
+		provider: OpenIdAuthProvider;
 		openModal: (params: JunoModalEditAuthConfigDetailType) => Promise<void>;
 	}
 
-	let { satellite, openModal }: Props = $props();
+	let { provider, satellite, openModal }: Props = $props();
 
 	const { config, supportConfig } = getContext<AuthConfigContext>(AUTH_CONFIG_CONTEXT_KEY);
 
+	let findProvider = $derived(provider === 'github' ? findProviderGitHub : findProviderGoogle);
+
 	let openid = $derived(fromNullable($config?.openid ?? []));
-	let google = $derived(openid?.providers.find(([key]) => 'Google' in key));
+	let openidProvider = $derived(findProvider(openid));
 
-	let providerData = $derived(google?.[1]);
+	let providerData = $derived(openidProvider?.[1]);
 
 	let clientId = $derived(providerData?.client_id);
 
@@ -55,12 +60,12 @@
 
 	const openEditModal = async () =>
 		await openModal({
-			google: null
+			openid: { provider }
 		});
 </script>
 
 <div class="card-container with-title">
-	<span class="title">Google</span>
+	<span class="title">{provider}</span>
 
 	<div class="columns-3 fit-column-1">
 		<div>
@@ -148,6 +153,10 @@
 	@use '../../../styles/mixins/text';
 	@use '../../../styles/mixins/media';
 
+	.title {
+		text-transform: capitalize;
+	}
+
 	p {
 		&:not(.client-id) {
 			@include text.truncate;
diff --git a/src/frontend/src/lib/components/satellites/auth/AuthSettings.svelte b/src/frontend/src/lib/components/satellites/auth/AuthSettings.svelte
index 0b72fd8298..60c77d65d5 100644
--- a/src/frontend/src/lib/components/satellites/auth/AuthSettings.svelte
+++ b/src/frontend/src/lib/components/satellites/auth/AuthSettings.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { setContext } from 'svelte';
 	import AuthConfigCore from '$lib/components/satellites/auth/AuthConfigCore.svelte';
-	import AuthConfigGoogle from '$lib/components/satellites/auth/AuthConfigGoogle.svelte';
 	import AuthConfigII from '$lib/components/satellites/auth/AuthConfigII.svelte';
+	import AuthConfigOpenId from '$lib/components/satellites/auth/AuthConfigOpenId.svelte';
 	import AuthProviders from '$lib/components/satellites/auth/AuthProviders.svelte';
 	import AuthSettingsLoader from '$lib/components/satellites/auth/AuthSettingsLoader.svelte';
 	import { listCustomDomains } from '$lib/services/satellite/hosting/custom-domain.services';
@@ -53,7 +53,9 @@
 <AuthSettingsLoader {satellite}>
 	<AuthProviders />
 
-	<AuthConfigGoogle {openModal} {satellite} />
+	<AuthConfigOpenId {openModal} provider="google" {satellite} />
+
+	<AuthConfigOpenId {openModal} provider="github" {satellite} />
 
 	<AuthConfigII {openModal} />
 
diff --git a/src/frontend/src/lib/i18n/en.json b/src/frontend/src/lib/i18n/en.json
index fbf426b574..4736149220 100644
--- a/src/frontend/src/lib/i18n/en.json
+++ b/src/frontend/src/lib/i18n/en.json
@@ -721,6 +721,7 @@
 		"auth_domain_config": "Unexpected error(s) while trying to update your authentication configuration.",
 		"auth_external_alternative_origins": "External alternative origins are malformed. Please provide a valid domain without a protocol.",
 		"auth_invalid_google_client_id": "Invalid Google client ID pattern detected.",
+		"auth_undefined_provider": "The provider to configure the OpenId authentication is undefined, which is unexpected.",
 		"mission_control_not_loaded": "Your Mission Control is not yet loaded.",
 		"mission_control_not_found": "You don't have a Mission Control.",
 		"mission_control_settings_not_loaded": "The settings for the Mission Control are not yet loaded.",
diff --git a/src/frontend/src/lib/i18n/zh-cn.json b/src/frontend/src/lib/i18n/zh-cn.json
index 66e2fdbac3..04f8592652 100644
--- a/src/frontend/src/lib/i18n/zh-cn.json
+++ b/src/frontend/src/lib/i18n/zh-cn.json
@@ -723,6 +723,7 @@
 		"auth_domain_config": "更新身份认证配置时发生意外错误。",
 		"auth_external_alternative_origins": "外部备用源格式错误，请提供不含协议的合法域名。",
 		"auth_invalid_google_client_id": "检测到无效的 Google 客户端 ID 格式。",
+		"auth_undefined_provider": "配置 OpenID 身份验证的提供商未定义，这是意外情况。",
 		"mission_control_not_loaded": "任务控制中心未加载。",
 		"mission_control_not_found": "您没有任务控制中心。",
 		"mission_control_settings_not_loaded": "任务控制中心设置未加载。",
diff --git a/src/frontend/src/lib/rest/emulator.rest.ts b/src/frontend/src/lib/rest/emulator.rest.ts
index ef40239fa0..ad326e4510 100644
--- a/src/frontend/src/lib/rest/emulator.rest.ts
+++ b/src/frontend/src/lib/rest/emulator.rest.ts
@@ -1,5 +1,6 @@
 import type { LedgerIdText, WalletId } from '$lib/schemas/wallet.schema';
 import { i18n } from '$lib/stores/app/i18n.store';
+import type { OpenIdAuthProvider } from '$lib/types/auth';
 import { assertNonNullish, isNullish } from '@dfinity/utils';
 import { type PrincipalText, PrincipalTextSchema } from '@dfinity/zod-schemas';
 import { encodeIcrcAccount } from '@icp-sdk/canisters/ledger/icrc';
@@ -55,16 +56,18 @@ export const emulatorLedgerTransfer = async ({
 };
 
 export const emulatorObservatoryMonitoringOpenId = async ({
-	action
+	action,
+	provider
 }: {
 	action: 'start' | 'stop';
+	provider: OpenIdAuthProvider;
 }) => {
 	const { VITE_EMULATOR_ADMIN_URL } = import.meta.env;
 
 	assertNonNullish(VITE_EMULATOR_ADMIN_URL);
 
 	const response = await fetch(
-		`${VITE_EMULATOR_ADMIN_URL}/observatory/monitoring/openid/?action=${action}`
+		`${VITE_EMULATOR_ADMIN_URL}/observatory/monitoring/openid/?action=${action}&provider=${provider}`
 	);
 
 	if (!response.ok) {
diff --git a/src/frontend/src/lib/services/emulator.services.ts b/src/frontend/src/lib/services/emulator.services.ts
index d2addaa5d8..0530523ce7 100644
--- a/src/frontend/src/lib/services/emulator.services.ts
+++ b/src/frontend/src/lib/services/emulator.services.ts
@@ -7,6 +7,7 @@ import { addSatellitesAdminAccessKey } from '$lib/services/access-keys/satellite
 import { i18n } from '$lib/stores/app/i18n.store';
 import { toasts } from '$lib/stores/app/toasts.store';
 import type { AddAdminAccessKeyParams } from '$lib/types/access-keys';
+import type { OpenIdAuthProvider } from '$lib/types/auth';
 import type { Identity } from '@icp-sdk/core/agent';
 import type { Principal } from '@icp-sdk/core/principal';
 import { get } from 'svelte/store';
@@ -56,14 +57,21 @@ const unsafeSetEmulatorController = async ({
 	});
 };
 
-export const emulatorToggleOpenIdMonitoring = async ({ enable }: { enable: boolean }) => {
+export const emulatorToggleOpenIdMonitoring = async ({
+	enable,
+	provider
+}: {
+	enable: boolean;
+	provider: OpenIdAuthProvider;
+}) => {
 	if (isNotSkylab()) {
 		throw new Error(get(i18n).emulator.error_never_execute_openid_monitoring);
 	}
 
 	try {
 		await emulatorObservatoryMonitoringOpenId({
-			action: enable ? 'start' : 'stop'
+			action: enable ? 'start' : 'stop',
+			provider
 		});
 	} catch (err: unknown) {
 		toasts.error({
diff --git a/src/frontend/src/lib/services/satellite/authentication/auth.config.services.ts b/src/frontend/src/lib/services/satellite/authentication/auth.config.services.ts
index de51d6295a..8b7e7e90ce 100644
--- a/src/frontend/src/lib/services/satellite/authentication/auth.config.services.ts
+++ b/src/frontend/src/lib/services/satellite/authentication/auth.config.services.ts
@@ -1,5 +1,9 @@
 import type { SatelliteDid } from '$declarations';
-import type { OpenIdAuthProviderDelegationConfig } from '$declarations/satellite/satellite.did';
+import type {
+	AuthenticationConfigOpenId,
+	OpenIdAuthProviderDelegationConfig,
+	OpenIdDelegationProvider
+} from '$declarations/satellite/satellite.did';
 import { setAuthConfig, setRule } from '$lib/api/satellites.api';
 import {
 	AUTH_DEFAULT_MAX_SESSION_TIME_TO_LIVE,
@@ -9,6 +13,7 @@ import { DEFAULT_RATE_CONFIG_TIME_PER_TOKEN_NS } from '$lib/constants/data.const
 import { DbCollectionType } from '$lib/constants/rules.constants';
 import { i18n } from '$lib/stores/app/i18n.store';
 import { toasts } from '$lib/stores/app/toasts.store';
+import type { OpenIdAuthProvider } from '$lib/types/auth';
 import type { OptionIdentity } from '$lib/types/itentity';
 import type { Satellite } from '$lib/types/satellite';
 import type { Option } from '$lib/types/utils';
@@ -17,6 +22,12 @@ import {
 	buildDeleteAuthenticationConfig,
 	buildSetAuthenticationConfig
 } from '$lib/utils/auth.config.utils';
+import {
+	filterProvidersNotGitHub,
+	filterProvidersNotGoogle,
+	findProviderGitHub,
+	findProviderGoogle
+} from '$lib/utils/auth.openid.utils';
 import {
 	fromNullable,
 	fromNullishNullable,
@@ -56,10 +67,11 @@ interface UpdateAuthConfigIIParams extends UpdateAuthConfigParams {
 	derivationOrigin: Option<URL>;
 }
 
-interface UpdateAuthConfigGoogleParams extends UpdateAuthConfigParams {
+interface UpdateAuthConfigOpenIdParams extends UpdateAuthConfigParams {
 	clientId: string | undefined;
 	maxTimeToLive: bigint | undefined;
 	allowedTargets: PrincipalText[] | null | undefined;
+	provider: OpenIdAuthProvider | null;
 }
 
 export const updateAuthConfigRules = async ({
@@ -147,8 +159,9 @@ export const updateAuthConfigGoogle = async ({
 	clientId,
 	maxTimeToLive,
 	allowedTargets,
-	identity
-}: UpdateAuthConfigGoogleParams): Promise<UpdateAuthConfigResult> => {
+	identity,
+	provider
+}: UpdateAuthConfigOpenIdParams): Promise<UpdateAuthConfigResult> => {
 	const labels = get(i18n);
 
 	if (isNullish(identity) || isNullish(identity?.getPrincipal())) {
@@ -156,23 +169,30 @@ export const updateAuthConfigGoogle = async ({
 		return { success: 'error' };
 	}
 
+	if (isNullish(provider)) {
+		toasts.error({ text: labels.errors.auth_undefined_provider });
+		return { success: 'error' };
+	}
+
 	if (isNullish(clientId)) {
-		const { result: resultConfig } = await disableConfigGoogle({
+		const { result: resultConfig } = await disableConfigOpenId({
 			satellite,
 			config,
-			identity
+			identity,
+			provider
 		});
 
 		return { success: resultConfig === 'error' ? 'error' : 'ok' };
 	}
 
-	if (!GOOGLE_CLIENT_ID_REGEX.test(clientId)) {
+	if (provider === 'google' && !GOOGLE_CLIENT_ID_REGEX.test(clientId)) {
 		toasts.error({ text: labels.errors.auth_invalid_google_client_id });
 		return { success: 'error' };
 	}
 
 	const { result: resultConfig } = await updateConfigGoogle({
 		satellite,
+		provider,
 		clientId,
 		maxTimeToLive,
 		allowedTargets,
@@ -254,25 +274,41 @@ const updateConfigInternetIdentity = async ({
 	});
 };
 
-const disableConfigGoogle = async ({
+const disableConfigOpenId = async ({
 	satellite,
 	config,
-	identity
-}: Pick<UpdateAuthConfigGoogleParams, 'config' | 'satellite'> &
-	Required<Pick<UpdateAuthConfigParams, 'identity'>>): Promise<UpdateResult> => {
+	identity,
+	provider
+}: Pick<UpdateAuthConfigOpenIdParams, 'config' | 'satellite'> &
+	Required<Pick<UpdateAuthConfigParams, 'identity'>> & {
+		provider: OpenIdAuthProvider;
+	}): Promise<UpdateResult> => {
+	const findProvider = provider === 'github' ? findProviderGitHub : findProviderGoogle;
+
 	const openid = fromNullable(config?.openid ?? []);
-	const google = openid?.providers.find(([key]) => 'Google' in key);
+	const openidProvider = findProvider(openid);
 
-	if (isNullish(google)) {
+	if (isNullish(openidProvider)) {
 		return { result: 'skip' };
 	}
 
-	// TODO: we set the all OpenID to None for simplicity reason as we do not support currently any other provider than Google
+	const filterProviders =
+		provider === 'github' ? filterProvidersNotGitHub : filterProvidersNotGoogle;
+	const openidProviders = filterProviders(openid);
+
+	const updateOpenId: AuthenticationConfigOpenId | undefined =
+		openidProviders.length > 0
+			? {
+					observatory_id: openid?.observatory_id ?? [],
+					providers: openidProviders
+				}
+			: undefined;
+
 	return await updateConfig({
 		config: {
 			internet_identity: config?.internet_identity ?? [],
 			rules: config?.rules ?? [],
-			openid: [],
+			openid: toNullable(updateOpenId),
 			version: config?.version ?? []
 		},
 		satellite,
@@ -286,14 +322,18 @@ const updateConfigGoogle = async ({
 	clientId,
 	maxTimeToLive,
 	allowedTargets,
-	identity
-}: Pick<UpdateAuthConfigGoogleParams, 'config' | 'maxTimeToLive' | 'allowedTargets' | 'satellite'> &
+	identity,
+	provider
+}: Pick<UpdateAuthConfigOpenIdParams, 'config' | 'maxTimeToLive' | 'allowedTargets' | 'satellite'> &
 	Required<Pick<UpdateAuthConfigParams, 'identity'>> & {
 		clientId: string;
+		provider: OpenIdAuthProvider;
 	}): Promise<UpdateResult> => {
+	const findProvider = provider === 'github' ? findProviderGitHub : findProviderGoogle;
+
 	const openid = fromNullable(config?.openid ?? []);
-	const google = openid?.providers.find(([key]) => 'Google' in key);
-	const providerData = google?.[1];
+	const openidProvider = findProvider(openid);
+	const providerData = openidProvider?.[1];
 	const delegation = fromNullable(providerData?.delegation ?? []);
 
 	const sameClientId = providerData?.client_id === clientId;
@@ -344,6 +384,13 @@ const updateConfigGoogle = async ({
 					}
 				: undefined;
 
+	const filterProviders =
+		provider === 'github' ? filterProvidersNotGitHub : filterProvidersNotGoogle;
+	const openidProviders = filterProviders(openid);
+
+	const delegationProvider: OpenIdDelegationProvider =
+		provider === 'github' ? { GitHub: null } : { Google: null };
+
 	return await updateConfig({
 		config: {
 			internet_identity: config?.internet_identity ?? [],
@@ -351,8 +398,9 @@ const updateConfigGoogle = async ({
 			openid: [
 				{
 					providers: [
+						...openidProviders,
 						[
-							{ Google: null },
+							delegationProvider,
 							{
 								client_id: clientId,
 								delegation: toNullable(updateDelegation)
diff --git a/src/frontend/src/lib/types/i18n.d.ts b/src/frontend/src/lib/types/i18n.d.ts
index b981840ab9..cb272ea2e3 100644
--- a/src/frontend/src/lib/types/i18n.d.ts
+++ b/src/frontend/src/lib/types/i18n.d.ts
@@ -739,6 +739,7 @@ interface I18nErrors {
 	auth_domain_config: string;
 	auth_external_alternative_origins: string;
 	auth_invalid_google_client_id: string;
+	auth_undefined_provider: string;
 	mission_control_not_loaded: string;
 	mission_control_not_found: string;
 	mission_control_settings_not_loaded: string;
diff --git a/src/frontend/src/lib/types/modal.ts b/src/frontend/src/lib/types/modal.ts
index cc4ff1d91b..70ea3c41d7 100644
--- a/src/frontend/src/lib/types/modal.ts
+++ b/src/frontend/src/lib/types/modal.ts
@@ -1,6 +1,7 @@
 import type { ConsoleDid, ICDid, MissionControlDid, OrbiterDid, SatelliteDid } from '$declarations';
 import type { SelectedToken, SelectedWallet } from '$lib/schemas/wallet.schema';
 import type { AddAccessKeyParams, AddAccessKeyResult } from '$lib/types/access-keys';
+import type { OpenIdAuthProvider } from '$lib/types/auth';
 import type { CanisterInfo, CanisterSegmentWithLabel, CanisterSettings } from '$lib/types/canister';
 import type { MissionControlId } from '$lib/types/mission-control';
 import type { OrbiterSatelliteConfigEntry } from '$lib/types/orbiter';
@@ -91,10 +92,10 @@ export interface JunoModalEditAuthConfigDetailCore {
 export type JunoModalEditAuthConfigDetailType =
 	| JunoModalEditAuthConfigDetailCore
 	| JunoModalEditAuthConfigDetailII
-	| JunoModalEditAuthConfigDetailGoogle;
+	| JunoModalEditAuthConfigDetailOpenId;
 
-export interface JunoModalEditAuthConfigDetailGoogle {
-	google: null;
+export interface JunoModalEditAuthConfigDetailOpenId {
+	openid: { provider: OpenIdAuthProvider };
 }
 
 export interface JunoModalEditAuthConfigDetailII {
diff --git a/src/frontend/src/lib/utils/auth.openid.utils.ts b/src/frontend/src/lib/utils/auth.openid.utils.ts
new file mode 100644
index 0000000000..2ae74c84ce
--- /dev/null
+++ b/src/frontend/src/lib/utils/auth.openid.utils.ts
@@ -0,0 +1,25 @@
+import type {
+	AuthenticationConfigOpenId,
+	OpenIdAuthProviderConfig,
+	OpenIdDelegationProvider
+} from '$declarations/satellite/satellite.did';
+
+export const findProviderGoogle = (
+	openid: AuthenticationConfigOpenId | undefined
+): [OpenIdDelegationProvider, OpenIdAuthProviderConfig] | undefined =>
+	openid?.providers.find(([key]) => 'Google' in key);
+
+export const filterProvidersNotGoogle = (
+	openid: AuthenticationConfigOpenId | undefined
+): [OpenIdDelegationProvider, OpenIdAuthProviderConfig][] =>
+	openid?.providers.filter(([key]) => !('Google' in key)) ?? [];
+
+export const findProviderGitHub = (
+	openid: AuthenticationConfigOpenId | undefined
+): [OpenIdDelegationProvider, OpenIdAuthProviderConfig] | undefined =>
+	openid?.providers.find(([key]) => 'GitHub' in key);
+
+export const filterProvidersNotGitHub = (
+	openid: AuthenticationConfigOpenId | undefined
+): [OpenIdDelegationProvider, OpenIdAuthProviderConfig][] =>
+	openid?.providers.filter(([key]) => !('GitHub' in key)) ?? [];
diff --git a/src/frontend/tests/lib/services/emulator.services.test.ts b/src/frontend/tests/lib/services/emulator.services.test.ts
index 318e12a901..2176d1fe2b 100644
--- a/src/frontend/tests/lib/services/emulator.services.test.ts
+++ b/src/frontend/tests/lib/services/emulator.services.test.ts
@@ -83,10 +83,12 @@ describe('emulator.services', () => {
 	});
 
 	describe('emulatorToggleOpenIdMonitoring', () => {
+		const provider = 'google';
+
 		it('should throw an error when mode is production', async () => {
 			vi.stubEnv('MODE', 'production');
 
-			await expect(emulatorToggleOpenIdMonitoring({ enable: true })).rejects.toThrowError(
+			await expect(emulatorToggleOpenIdMonitoring({ enable: true, provider })).rejects.toThrowError(
 				i18Mock.emulator.error_never_execute_openid_monitoring
 			);
 		});
@@ -95,20 +97,28 @@ describe('emulator.services', () => {
 			vi.stubEnv('MODE', 'skylab');
 
 			await emulatorToggleOpenIdMonitoring({
-				enable: true
+				enable: true,
+				provider
 			});
 
-			expect(emulatorObservatoryMonitoringOpenId).toHaveBeenCalledWith({ action: 'start' });
+			expect(emulatorObservatoryMonitoringOpenId).toHaveBeenCalledWith({
+				action: 'start',
+				provider
+			});
 		});
 
 		it('should stop observatory monitoring openid when in skylab mode', async () => {
 			vi.stubEnv('MODE', 'skylab');
 
 			await emulatorToggleOpenIdMonitoring({
-				enable: false
+				enable: false,
+				provider
 			});
 
-			expect(emulatorObservatoryMonitoringOpenId).toHaveBeenCalledWith({ action: 'stop' });
+			expect(emulatorObservatoryMonitoringOpenId).toHaveBeenCalledWith({
+				action: 'stop',
+				provider
+			});
 		});
 
 		it('should toasts an error in skylab mode if admin server cannot be reached', async () => {
@@ -123,7 +133,8 @@ describe('emulator.services', () => {
 			const spy = vi.spyOn(toasts, 'error').mockImplementation(vi.fn());
 
 			await emulatorToggleOpenIdMonitoring({
-				enable: true
+				enable: true,
+				provider
 			});
 
 			expect(spy).toHaveBeenCalledWith({