diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index f7dc681d16..c12dd72716 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,3 +1,6 @@
+{{ $cloudAppUrl := "https://cloud.layer5.io" }}
+{{ $cloudAcademyUrl := printf "%s/academy" $cloudAppUrl }}
+{{ $cloudLoginUrl := printf "%s/login" $cloudAppUrl }}
 <header>
   <nav
     class="td-navbar navbar-dark js-navbar-scroll td-navbar-cover navbar-bg-onscroll--fade"
@@ -39,7 +42,7 @@
                         <div class="dropdown-menu dropdown-menu--col" aria-labelledby="resourcesDropdown" style="visibility:hidden;">
                           <a
                           class="dropdown-item dropdown-item--row"
-                          href="https://cloud.layer5.io/academy"
+                          href="{{ $cloudAcademyUrl }}"
                           target="_blank"
                           >
                             <div class="logo-container">
@@ -171,7 +174,7 @@
               <div class="dropdown-divider"></div>
               <a
                 class="dropdown-item"
-                href="https://cloud.layer5.io/academy"
+                href="{{ $cloudAcademyUrl }}"
                 target="_blank"
               >
                 <div class="logo-container">
@@ -186,10 +189,10 @@
             </div>
           </li>
           <li class="nav-item" id="signin-button" style="display: none;">
-            <a class="nav-link" href="https://cloud.layer5.io/login" target="_blank">Sign In</a>
+            <a class="nav-link" href="{{ $cloudLoginUrl }}" target="_blank">Sign In</a>
           </li>
           <li class="nav-item dropdown" data-bs-theme="dark" id="userlist" style="display: none;">
-             <a href="" id="user-profile-url">
+             <a href="{{ $cloudAppUrl }}" id="user-profile-url">
               <div
                 class="nav-link avatar-container"
                id="avatarDropdown"
@@ -260,6 +263,7 @@
       cur.href = "javascript: void(0)";
     }
   
+  const cloudAppUrl = "{{ $cloudAppUrl }}";
   let isUserAuthenticated = false;
   let expiredToken = "";
 
@@ -288,7 +292,7 @@
         }
       throw new Error("missing or expired cookie");
     }
-      const re = await fetch("https://cloud.layer5.io/api/identity/users/profile", {
+      const re = await fetch(`${cloudAppUrl}/api/identity/users/profile`, {
         method: 'GET',
         headers: {
           'Authorization': `Bearer ${token}`,
@@ -311,20 +315,43 @@
     showSignInButton();
   }
 };
-function updateUI(response) {
-document.getElementById('signin-button').style.display = 'none';
-document.getElementById("userlist").style.display = "block";
-const avatarUrl = response.avatar_url;
-const avatarContainer = document.querySelector('.avatar-container');
-avatarContainer.style.backgroundImage = `url("${avatarUrl}")`;
-avatarContainer.style.backgroundSize = 'cover';
+  function getAvatarUrl(response) {
+    if (
+      response &&
+      typeof response.avatar_url === "string" &&
+      response.avatar_url.trim()
+    ) {
+      return response.avatar_url.trim();
+    }
 
-const userId = response.id;
-const cloudLink = document.getElementById('user-profile-url');
-cloudLink.href = `https://cloud.layer5.io/user/${userId}`;
+    return "";
+  }
 
-isUserAuthenticated = true;
-}
+  function getUserProfileUrl(response) {
+    const userId = response?.id;
+    if (userId) {
+      return `${cloudAppUrl}/user/${encodeURIComponent(userId)}`;
+    }
+
+    return cloudAppUrl;
+  }
+
+  function updateUI(response) {
+    document.getElementById('signin-button').style.display = 'none';
+    document.getElementById("userlist").style.display = "block";
+
+    const avatarUrl = getAvatarUrl(response);
+    const avatarContainer = document.querySelector('.avatar-container');
+    if (avatarContainer) {
+      avatarContainer.style.backgroundImage = avatarUrl ? `url("${avatarUrl}")` : "none";
+      avatarContainer.style.backgroundSize = avatarUrl ? "cover" : "";
+    }
+
+    const cloudLink = document.getElementById('user-profile-url');
+    cloudLink.href = getUserProfileUrl(response);
+
+    isUserAuthenticated = true;
+  }
 
 function showSignInButton() {
       document.getElementById("userlist").style.display = "none";