diff --git a/components/Layout/Layout.tsx b/components/Layout/Layout.tsx
index 64830dbd..2b172983 100644
--- a/components/Layout/Layout.tsx
+++ b/components/Layout/Layout.tsx
@@ -31,18 +31,18 @@ type LayoutProps = {
   children: ReactNode;
 };
 
-export default function Layout({
-  title,
-  description,
-  basePath = "attendee",
-  children,
-}: LayoutProps) {
+export default function Layout({ title, description, children }: LayoutProps) {
   const { user, logout } = useAuth();
   const [isNavbarOpen, setIsNavbarOpen] = useState(false);
   const router = useRouter();
 
   const currentHref = router.asPath;
-  const links = roleNavigations[user.type];
+  // FIXME: normalize user type between moonstone and safira
+  const links =
+    user.type === "company"
+      ? roleNavigations["sponsor"]
+      : roleNavigations[user.type];
+  const basePath = user.type === "company" ? "sponsor" : user.type;
 
   const openNavbar = () => {
     setIsNavbarOpen(true);
diff --git a/layout/Manager/Badges/Badges.tsx b/layout/Manager/Badges/Badges.tsx
index b87203b3..0cfc9ae5 100644
--- a/layout/Manager/Badges/Badges.tsx
+++ b/layout/Manager/Badges/Badges.tsx
@@ -69,7 +69,7 @@ function Badges() {
   };
 
   return (
-    <Layout title="Badges" description="Award a badge" basePath="manager">
+    <Layout title="Badges" description="Award a badge">
       {showScanner ? (
         <div className="mt-5">
           <QRScanner
diff --git a/layout/Manager/Identifier/Identifier.tsx b/layout/Manager/Identifier/Identifier.tsx
index 21366d31..7e2009d3 100644
--- a/layout/Manager/Identifier/Identifier.tsx
+++ b/layout/Manager/Identifier/Identifier.tsx
@@ -49,11 +49,7 @@ function Identifier() {
   };
 
   return (
-    <Layout
-      title="Identifier"
-      description="Identify an attendee"
-      basePath="manager"
-    >
+    <Layout title="Identifier" description="Identify an attendee">
       <div className="mt-5">
         <QRScanner
           handleCode={handleUUID}
diff --git a/layout/Manager/Prize/Prize.tsx b/layout/Manager/Prize/Prize.tsx
index 3d132fc5..0e5dbe0c 100644
--- a/layout/Manager/Prize/Prize.tsx
+++ b/layout/Manager/Prize/Prize.tsx
@@ -56,11 +56,7 @@ function Prize() {
   };
 
   return (
-    <Layout
-      title="Prizes"
-      description="Mark a prize as redeemed"
-      basePath="manager"
-    >
+    <Layout title="Prizes" description="Mark a prize as redeemed">
       <div className="my-5">
         <button
           className={`font-iregular bg-${
diff --git a/layout/Manager/Prizes/Prizes.tsx b/layout/Manager/Prizes/Prizes.tsx
index 90231eed..7235a795 100644
--- a/layout/Manager/Prizes/Prizes.tsx
+++ b/layout/Manager/Prizes/Prizes.tsx
@@ -18,11 +18,7 @@ function Prizes() {
   };
 
   return (
-    <Layout
-      title="Prizes"
-      description="Mark a prize as redeemed"
-      basePath="manager"
-    >
+    <Layout title="Prizes" description="Mark a prize as redeemed">
       <div className="mt-5">
         <QRScanner
           handleCode={handleUUID}
diff --git a/layout/Sponsor/Dashboard/Dashboard.tsx b/layout/Sponsor/Dashboard/Dashboard.tsx
index 3d16e758..915130d7 100644
--- a/layout/Sponsor/Dashboard/Dashboard.tsx
+++ b/layout/Sponsor/Dashboard/Dashboard.tsx
@@ -17,7 +17,6 @@ const SponsorDashboard: React.FC = () => {
     <Layout
       title="Dashboard"
       description="Neste local, pode dar badges ao participantes que se encontram no seu stand"
-      basePath="sponsor"
     >
       <div className="mt-10 grid grid-cols-1 lg:grid-cols-2">
         <div className="mr-3 w-full">
diff --git a/layout/Sponsor/Scanner/Scanner.tsx b/layout/Sponsor/Scanner/Scanner.tsx
index b60215fa..1d28bc00 100644
--- a/layout/Sponsor/Scanner/Scanner.tsx
+++ b/layout/Sponsor/Scanner/Scanner.tsx
@@ -47,7 +47,6 @@ const SponsorBadges: React.FC = () => {
     <Layout
       title="Scanner"
       description="Recompensa os teus visitantes com o badge"
-      basePath="sponsor"
     >
       <div className="mt-5">
         <QRScanner
diff --git a/layout/Sponsor/Spotlight/Spotlight.tsx b/layout/Sponsor/Spotlight/Spotlight.tsx
index 61482053..160903f8 100644
--- a/layout/Sponsor/Spotlight/Spotlight.tsx
+++ b/layout/Sponsor/Spotlight/Spotlight.tsx
@@ -4,11 +4,7 @@ import Layout from "@components/Layout";
 
 const Spotlight: React.FC = () => {
   return (
-    <Layout
-      title="Spotlight"
-      description="Coloque a sua empresa em destaque"
-      basePath="sponsor"
-    >
+    <Layout title="Spotlight" description="Coloque a sua empresa em destaque">
       <div>
         <div className="mt-8 md:mt-16">
           <h1 className="text-iextrabold font-ibold text-4xl text-white sm:text-5xl">
diff --git a/layout/Sponsor/Visitors/Visitors.tsx b/layout/Sponsor/Visitors/Visitors.tsx
index 6761b803..55b95db0 100644
--- a/layout/Sponsor/Visitors/Visitors.tsx
+++ b/layout/Sponsor/Visitors/Visitors.tsx
@@ -60,7 +60,6 @@ const SponsorVisitors: React.FC = () => {
     <Layout
       title="Visitantes"
       description="Veja quem está a visitar a sua empresa e já recebeu o seu badge"
-      basePath="sponsor"
     >
       <div className="mt-5 h-screen text-white">
         {visitors.filter((v) => v.cv != null).length > 0 && (