diff --git a/src/components/DeployApplicationSelector/DeployApplicationSelector.tsx b/src/components/DeployApplicationSelector/DeployApplicationSelector.tsx
index cd54310a..6a600b80 100644
--- a/src/components/DeployApplicationSelector/DeployApplicationSelector.tsx
+++ b/src/components/DeployApplicationSelector/DeployApplicationSelector.tsx
@@ -13,6 +13,7 @@ import { createRobot } from "../../toolkit/RobotSlice";
 import { useNavigate } from "react-router-dom";
 import { createTrial } from "../../toolkit/TrialSlice";
 import useMain from "../../hooks/useMain";
+import { envOnPremise } from "../../helpers/envProvider";
 
 interface IDeployApplicationSelector {
   item: any;
@@ -412,7 +413,9 @@ export default function DeployApplicationSelector({
             src={`/svg/general/fleet/fleet-gray.svg`}
             alt="robolaunch"
           />
-          <span className="capitalize text-xs">Fleet</span>
+          <span className="capitalize text-xs">
+            {envOnPremise ? "Namespace" : "Fleet"}
+          </span>
         </div>
         <div className="flex items-center gap-3">
           {!formik?.values?.fleet && (
diff --git a/src/components/PrivateSidebar/PrivateSidebar.tsx b/src/components/PrivateSidebar/PrivateSidebar.tsx
index fc1014b8..49a8ed1c 100644
--- a/src/components/PrivateSidebar/PrivateSidebar.tsx
+++ b/src/components/PrivateSidebar/PrivateSidebar.tsx
@@ -37,55 +37,60 @@ export default function PrivateSidebar(): ReactElement {
                   description="You can go back to the previous page here."
                 />
               )}
-              <SideBarMenuItem
-                type="robot"
-                description="You can access all your robots here."
-                loading={isLoading}
-                disabled={
-                  sidebarState?.isCreateMode &&
-                  (sidebarState?.page === "robot" ||
-                    sidebarState?.page === "workspacesmanager" ||
-                    sidebarState?.page === "buildsmanager" ||
-                    sidebarState?.page === "launchsmanager")
-                }
-              />
-              <SideBarMenuItem
-                type="workspacesmanager"
-                description="You can access all your workspaces here."
-                loading={isLoading}
-                disabled={
-                  sidebarState?.isCreateMode &&
-                  (sidebarState?.page === "robot" ||
-                    sidebarState?.page === "workspacesmanager" ||
-                    sidebarState?.page === "buildsmanager" ||
-                    sidebarState?.page === "launchsmanager")
-                }
-              />
 
-              <SideBarMenuItem
-                type="buildsmanager"
-                description="You can access all your builds here."
-                loading={isLoading}
-                disabled={
-                  sidebarState?.isCreateMode &&
-                  (sidebarState?.page === "robot" ||
-                    sidebarState?.page === "workspacesmanager" ||
-                    sidebarState?.page === "buildsmanager" ||
-                    sidebarState?.page === "launchsmanager")
-                }
-              />
-              <SideBarMenuItem
-                type="launchsmanager"
-                description="You can access all your launches here."
-                loading={isLoading}
-                disabled={
-                  sidebarState?.isCreateMode &&
-                  (sidebarState?.page === "robot" ||
-                    sidebarState?.page === "workspacesmanager" ||
-                    sidebarState?.page === "buildsmanager" ||
-                    sidebarState?.page === "launchsmanager")
-                }
-              />
+              {!envOnPremise && (
+                <Fragment>
+                  <SideBarMenuItem
+                    type="robot"
+                    description="You can access all your robots here."
+                    loading={isLoading}
+                    disabled={
+                      sidebarState?.isCreateMode &&
+                      (sidebarState?.page === "robot" ||
+                        sidebarState?.page === "workspacesmanager" ||
+                        sidebarState?.page === "buildsmanager" ||
+                        sidebarState?.page === "launchsmanager")
+                    }
+                  />
+                  <SideBarMenuItem
+                    type="workspacesmanager"
+                    description="You can access all your workspaces here."
+                    loading={isLoading}
+                    disabled={
+                      sidebarState?.isCreateMode &&
+                      (sidebarState?.page === "robot" ||
+                        sidebarState?.page === "workspacesmanager" ||
+                        sidebarState?.page === "buildsmanager" ||
+                        sidebarState?.page === "launchsmanager")
+                    }
+                  />
+
+                  <SideBarMenuItem
+                    type="buildsmanager"
+                    description="You can access all your builds here."
+                    loading={isLoading}
+                    disabled={
+                      sidebarState?.isCreateMode &&
+                      (sidebarState?.page === "robot" ||
+                        sidebarState?.page === "workspacesmanager" ||
+                        sidebarState?.page === "buildsmanager" ||
+                        sidebarState?.page === "launchsmanager")
+                    }
+                  />
+                  <SideBarMenuItem
+                    type="launchsmanager"
+                    description="You can access all your launches here."
+                    loading={isLoading}
+                    disabled={
+                      sidebarState?.isCreateMode &&
+                      (sidebarState?.page === "robot" ||
+                        sidebarState?.page === "workspacesmanager" ||
+                        sidebarState?.page === "buildsmanager" ||
+                        sidebarState?.page === "launchsmanager")
+                    }
+                  />
+                </Fragment>
+              )}
             </Fragment>
           ) : (
             <Fragment>
diff --git a/src/components/RobotHeader/RobotHeader.tsx b/src/components/RobotHeader/RobotHeader.tsx
index f91892c3..9b6e4d52 100644
--- a/src/components/RobotHeader/RobotHeader.tsx
+++ b/src/components/RobotHeader/RobotHeader.tsx
@@ -91,9 +91,9 @@ export default function RobotHeader({
                 className={`text-[0.64rem] capitalize font-medium px-3 py-1 rounded-lg w-fit text-layer-primary-500 bg-layer-primary-100`}
               >
                 {responseRobot?.robotClusters?.length === 1
-                  ? "Virtual Robot"
+                  ? `Virtual ${envOnPremise ? "Application" : "Robot"}`
                   : (responseRobot?.robotClusters?.length === 2 &&
-                      "Physical Robot") || (
+                      `Physical ${envOnPremise ? "Application" : "Robot"}`) || (
                       <ContentLoader
                         speed={1}
                         width={64}