diff --git a/.env.development b/.env.development
index 81857cc..02e7209 100644
--- a/.env.development
+++ b/.env.development
@@ -74,10 +74,13 @@ NEXT_PUBLIC_MEDUSA_PUBLISHABLE_KEY=pk_e23a820689a07d55aa0a0ad187268559f5d6288ecb
 #NEXT_PUBLIC_MEDUSA_PUBLISHABLE_KEY=pk_0ec86252438b38ce18d5601f7877e4395d7e0a6afa8687dfea8d37af33015633
 
 #### SUPABASE
-#NEXT_PUBLIC_SUPABASE_URL=http://5.181.51.38:54321
-#NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
-#SUPABASE_SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU
+NEXT_PUBLIC_SUPABASE_URL=http://5.181.51.38:54321
+NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
+SUPABASE_SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU
 
 #######
 
+SUPABASE_AUTH_CLIENT_ID=mrb2b
 SUPABASE_AUTH_KEYCLOAK_SECRET=87febdec-8773-11f0-8fef-3316a0517d23
+SUPABASE_AUTH_KEYCLOAK_URL=https://keycloak.medreport.ee/realms/mrb2b
+SUPABASE_AUTH_KEYCLOAK_CALLBACK_URL=http://localhost:3000/auth/callback
diff --git a/supabase/config.toml b/supabase/config.toml
index a066441..c3d0a96 100644
--- a/supabase/config.toml
+++ b/supabase/config.toml
@@ -271,10 +271,10 @@ skip_nonce_check = false
 
 [auth.external.keycloak]
 enabled = true
-client_id = "supabase"
-secret = "env(SUPABASE_AUTH_KEYCLOAK_SECRET)" # We'll configure this in the next step!
-redirect_uri = "https://test.medreport.ee/auth/v1/callback"
-url = "https://keycloak.medreport.ee/realms/mrb2b"
+client_id = "env(SUPABASE_AUTH_CLIENT_ID)"
+secret = "env(SUPABASE_AUTH_KEYCLOAK_SECRET)"
+redirect_uri = "env(SUPABASE_AUTH_KEYCLOAK_CALLBACK_URL)"
+url = "env(SUPABASE_AUTH_KEYCLOAK_URL)"
 skip_nonce_check = false
 
 # Use Firebase Auth as a third-party provider alongside Supabase Auth.