diff --git a/lib/constants.ts b/lib/constants.ts
index 9ad2b34..3331cf2 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -1,7 +1,8 @@
 export const PUBLIC_URL = process.env.NEXT_PUBLIC_URL as string;
 export const SERVER_URL = process.env.SERVER_URL as string;
 export const API_URL = `${SERVER_URL}/api`;
-export const OAUTH_URL = `${SERVER_URL}/oauth2`;
+export const AUTHORIZE_URL = process.env.AUTHORIZE_URL as string;
+export const TOKEN_URL = process.env.TOKEN_URL as string;
 export const REDIRECT_URL = `${PUBLIC_URL}/api/callback`;
 export const CLIENT_ID = process.env.CLIENT_ID as string;
 export const CLIENT_SECRET = process.env.CLIENT_SECRET as string;
diff --git a/lib/utils/fetch.ts b/lib/utils/fetch.ts
index ccd6339..e26a338 100644
--- a/lib/utils/fetch.ts
+++ b/lib/utils/fetch.ts
@@ -1,4 +1,4 @@
-import { API_URL, CLIENT_ID, CLIENT_SECRET, OAUTH_URL } from '../constants';
+import { CLIENT_ID, CLIENT_SECRET, TOKEN_URL } from '../constants';
 import { OAuth2TokenDto } from '../types/token-response.interface';
 
 export async function fetchBearer<T>(
@@ -16,7 +16,7 @@ export async function fetchBearer<T>(
 }
 
 export async function fetchToken(code: string): Promise<OAuth2TokenDto> {
-  return fetch(`${OAUTH_URL}/token`, {
+  return fetch(TOKEN_URL, {
     headers: {
       Authorization: `Basic ${Buffer.from(
         `${CLIENT_ID}:${CLIENT_SECRET}`
diff --git a/next.config.js b/next.config.js
index 98bdd94..87652ef 100644
--- a/next.config.js
+++ b/next.config.js
@@ -3,7 +3,7 @@ const nextConfig = {
   reactStrictMode: true,
   swcMinify: true,
   images: {
-    domains: ['localhost', '127.0.0.1', 'icynet.eu'],
+    domains: ['localhost', '127.0.0.1', 'secure.icynet.eu'],
   },
 };
 
diff --git a/pages/api/login.ts b/pages/api/login.ts
index 5ce8345..8c0cfc0 100644
--- a/pages/api/login.ts
+++ b/pages/api/login.ts
@@ -1,9 +1,9 @@
 import Cookies from 'cookies';
 import { NextApiRequest, NextApiResponse } from 'next';
 import {
+  AUTHORIZE_URL,
   CLIENT_ID,
   COOKIE_KEYS,
-  OAUTH_URL,
   REDIRECT_URL,
 } from '../../lib/constants';
 import { encrypt, generateString } from '../../lib/utils/crypto';
@@ -34,5 +34,5 @@ export default function handler(req: NextApiRequest, res: NextApiResponse) {
     signed: true,
   });
 
-  res.redirect(`${OAUTH_URL}/authorize?${params.toString()}`);
+  res.redirect(`${AUTHORIZE_URL}?${params.toString()}`);
 }
diff --git a/server/proxy.ts b/server/proxy.ts
index 7837d9b..805062e 100644
--- a/server/proxy.ts
+++ b/server/proxy.ts
@@ -5,6 +5,7 @@ export const proxy = httpProxy.createProxyServer({
    * Get the actual back-end service url from env variables.
    * We shouldn't prefix the env variable with NEXT_PUBLIC_* to avoid exposing it to the client.
    */
+  changeOrigin: process.env.NODE_ENV === 'production',
   target: process.env.SERVER_URL,
   autoRewrite: false,
 });