diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts
index d5f34ecb09d19c0a8790d09ea5295fe209ec002e..30ed859eec183a890ca7cc60e6c9921cc6c4e007 100644
--- a/src/app/core/services/auth.service.ts
+++ b/src/app/core/services/auth.service.ts
@@ -30,7 +30,7 @@ export class AuthService {
   }
 
   exchangeCode(code: string, state: string): Observable<boolean> {
-    const url = `${env.kongUrl}/authentication/token?code=${code}&state=${state}`;
+    const url = `${env.tokenEndpoint}?code=${code}&state=${state}`;
     return this._http.get<ILoginResponse>(url).pipe(
       map(
         (res) => {
@@ -81,8 +81,7 @@ export class AuthService {
     } catch (error) {
     }
 
-    let url = `${env.kongUrl}/authentication/logout?`;
-    url += `id_token=${idToken}&identity_provider=${identityProvider}`;
+    const url = `${env.logoutEndpoint}?id_token=${idToken}&identity_provider=${identityProvider}`;
 
     window.location.href = url;
   }
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index 773028e6ce3f95ac248d1bce8c8b3003626de84a..a50d216033c3fa72deed355a399f11a8998eeeed 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -12,6 +12,7 @@ export const environment = {
   kongUrl: kongBaseUrl,
   oidcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/oidc',
   glcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/glc',
+  tokenEndpoint: kongBaseUrl + '/authentication/dev/token',
   logoutEndpoint: kongBaseUrl + '/authentication/dev/logout',
 
   // ElasticSearch
diff --git a/src/environments/environment.rec.ts b/src/environments/environment.rec.ts
index d6a82f0d79b50630d140306d27e9b60430fc4c6e..83e827b9b322eb0022c9103ead009fcd0216562c 100644
--- a/src/environments/environment.rec.ts
+++ b/src/environments/environment.rec.ts
@@ -12,6 +12,7 @@ export const environment = {
   kongUrl: kongBaseUrl,
   oidcLoginEndpoint: kongBaseUrl + '/authentication/rec/login/oidc',
   glcLoginEndpoint: kongBaseUrl + '/authentication/rec/login/glc',
+  tokenEndpoint: kongBaseUrl + '/authentication/rec/token',
   logoutEndpoint: kongBaseUrl + '/authentication/rec/logout',
 
   // ElasticSearch
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b860dc1b9c6f01641baac30ab7e331a8ca31d590..80ba10eef0f8f06b7fe53c1f81936981213d7ca5 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -12,6 +12,7 @@ export const environment = {
   kongUrl: kongBaseUrl,
   oidcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/oidc',
   glcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/glc',
+  tokenEndpoint: kongBaseUrl + '/authentication/dev/token',
   logoutEndpoint: kongBaseUrl + '/authentication/dev/logout',
 
   // ElasticSearch