diff --git a/frontend/src/hooks/api/migration/mutations.tsx b/frontend/src/hooks/api/migration/mutations.tsx
index c2b903f8a..87ba89eab 100644
--- a/frontend/src/hooks/api/migration/mutations.tsx
+++ b/frontend/src/hooks/api/migration/mutations.tsx
@@ -3,7 +3,6 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { apiRequest } from "@app/config/request";
 
 import { workspaceKeys } from "../workspace";
-import { ProjectType } from "../workspace/types";
 
 export const useImportEnvKey = () => {
   const queryClient = useQueryClient();
@@ -35,7 +34,7 @@ export const useImportEnvKey = () => {
     },
     onSuccess: () => {
       queryClient.invalidateQueries({
-        queryKey: workspaceKeys.getAllUserWorkspace(ProjectType.SecretManager)
+        queryKey: workspaceKeys.getAllUserWorkspace()
       });
     }
   });
diff --git a/frontend/src/hooks/api/organization/queries.tsx b/frontend/src/hooks/api/organization/queries.tsx
index 2eddda50a..b5637f049 100644
--- a/frontend/src/hooks/api/organization/queries.tsx
+++ b/frontend/src/hooks/api/organization/queries.tsx
@@ -42,7 +42,7 @@ export const organizationKeys = {
     [...organizationKeys.getOrgIdentityMemberships(orgId), params] as const,
   getOrgGroups: (orgId: string) => [{ orgId }, "organization-groups"] as const,
   getOrgIntegrationAuths: (orgId: string) => [{ orgId }, "integration-auths"] as const,
-  getOrgById: (orgId: string) => ["org-by-id", { orgId }]
+  getOrgById: (orgId: string) => ["organization", { orgId }]
 };
 
 export const fetchOrganizations = async () => {
diff --git a/frontend/src/hooks/api/workspace/mutations.tsx b/frontend/src/hooks/api/workspace/mutations.tsx
index a53151840..1ae0efe08 100644
--- a/frontend/src/hooks/api/workspace/mutations.tsx
+++ b/frontend/src/hooks/api/workspace/mutations.tsx
@@ -4,7 +4,7 @@ import { apiRequest } from "@app/config/request";
 
 import { userKeys } from "../users/query-keys";
 import { workspaceKeys } from "./query-keys";
-import { ProjectType, TUpdateWorkspaceGroupRoleDTO } from "./types";
+import { TUpdateWorkspaceGroupRoleDTO } from "./types";
 
 export const useAddGroupToWorkspace = () => {
   const queryClient = useQueryClient();
@@ -102,7 +102,7 @@ export const useMigrateProjectToV3 = () => {
     },
     onSuccess: () => {
       queryClient.invalidateQueries({
-        queryKey: workspaceKeys.getAllUserWorkspace(ProjectType.SecretManager)
+        queryKey: workspaceKeys.getAllUserWorkspace()
       });
     }
   });
diff --git a/frontend/src/hooks/api/workspace/queries.tsx b/frontend/src/hooks/api/workspace/queries.tsx
index af692b390..2c7e75a97 100644
--- a/frontend/src/hooks/api/workspace/queries.tsx
+++ b/frontend/src/hooks/api/workspace/queries.tsx
@@ -86,7 +86,7 @@ export const useUpgradeProject = () => {
     },
     onSuccess: () => {
       queryClient.invalidateQueries({
-        queryKey: workspaceKeys.getAllUserWorkspace(ProjectType.SecretManager)
+        queryKey: workspaceKeys.getAllUserWorkspace()
       });
     }
   });
@@ -151,7 +151,7 @@ export const useGetUserWorkspaces = ({
   type?: ProjectType | "all";
 } = {}) =>
   useQuery({
-    queryKey: workspaceKeys.getAllUserWorkspace(type || ""),
+    queryKey: workspaceKeys.getAllUserWorkspace(),
     queryFn: () => fetchUserWorkspaces(includeRoles, type)
   });
 
@@ -261,8 +261,8 @@ export const useUpdateProject = () => {
       );
       return data.workspace;
     },
-    onSuccess: (dto) => {
-      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace(dto.type) });
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace() });
     }
   });
 };
@@ -280,8 +280,8 @@ export const useToggleAutoCapitalization = () => {
       );
       return data.workspace;
     },
-    onSuccess: (dto) => {
-      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace(dto.type) });
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace() });
     }
   });
 };
@@ -296,8 +296,8 @@ export const useUpdateWorkspaceVersionLimit = () => {
       });
       return data.workspace;
     },
-    onSuccess: (dto) => {
-      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace(dto.type) });
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace() });
     }
   });
 };
@@ -350,7 +350,7 @@ export const useCreateWsEnvironment = () => {
     },
     onSuccess: () => {
       queryClient.invalidateQueries({
-        queryKey: workspaceKeys.getAllUserWorkspace(ProjectType.SecretManager)
+        queryKey: workspaceKeys.getAllUserWorkspace()
       });
     }
   });
@@ -369,7 +369,7 @@ export const useUpdateWsEnvironment = () => {
     },
     onSuccess: () => {
       queryClient.invalidateQueries({
-        queryKey: workspaceKeys.getAllUserWorkspace(ProjectType.SecretManager)
+        queryKey: workspaceKeys.getAllUserWorkspace()
       });
     }
   });
@@ -384,7 +384,7 @@ export const useDeleteWsEnvironment = () => {
     },
     onSuccess: () => {
       queryClient.invalidateQueries({
-        queryKey: workspaceKeys.getAllUserWorkspace(ProjectType.SecretManager)
+        queryKey: workspaceKeys.getAllUserWorkspace()
       });
     }
   });
diff --git a/frontend/src/hooks/api/workspace/query-keys.tsx b/frontend/src/hooks/api/workspace/query-keys.tsx
index 1005fe8bc..44fee901c 100644
--- a/frontend/src/hooks/api/workspace/query-keys.tsx
+++ b/frontend/src/hooks/api/workspace/query-keys.tsx
@@ -3,7 +3,7 @@ import { TListProjectIdentitiesDTO } from "@app/hooks/api/workspace/types";
 import type { CaStatus } from "../ca";
 
 export const workspaceKeys = {
-  getWorkspaceById: (workspaceId: string) => [{ workspaceId }, "workspace"] as const,
+  getWorkspaceById: (workspaceId: string) => ["workspaces", { workspaceId }] as const,
   getWorkspaceSecrets: (workspaceId: string) => [{ workspaceId }, "workspace-secrets"] as const,
   getWorkspaceIndexStatus: (workspaceId: string) =>
     [{ workspaceId }, "workspace-index-status"] as const,
@@ -12,7 +12,7 @@ export const workspaceKeys = {
   getWorkspaceAuthorization: (workspaceId: string) => [{ workspaceId }, "workspace-authorizations"],
   getWorkspaceIntegrations: (workspaceId: string) => [{ workspaceId }, "workspace-integrations"],
   getAllUserWorkspace: (type?: string) =>
-    type ? ["workspaces", { type }] : (["workspace"] as const),
+    type ? ["workspaces", { type }] : (["workspaces"] as const),
   getWorkspaceAuditLogs: (workspaceId: string) =>
     [{ workspaceId }, "workspace-audit-logs"] as const,
   getWorkspaceUsers: (workspaceId: string) => [{ workspaceId }, "workspace-users"] as const,
diff --git a/frontend/src/pages/auth/CliRedirectPage/CliRedirectPage.tsx b/frontend/src/pages/auth/CliRedirectPage/CliRedirectPage.tsx
index 476127a67..aeede67f1 100644
--- a/frontend/src/pages/auth/CliRedirectPage/CliRedirectPage.tsx
+++ b/frontend/src/pages/auth/CliRedirectPage/CliRedirectPage.tsx
@@ -42,7 +42,14 @@ export const CliRedirectPage = () => {
       </Helmet>
       <div className="flex h-screen w-screen flex-col items-center justify-center space-y-4 text-gray-200">
         <div className="mb-4 flex justify-center">
-          <img src="/images/gradientLogo.svg" height={90} width={120} alt="Infisical Logo" />
+          <img
+            src="/images/gradientLogo.svg"
+            style={{
+              height: "90px",
+              width: "120px"
+            }}
+            alt="Infisical Logo"
+          />
         </div>
         {cliToken ? (
           <>
diff --git a/frontend/src/pages/auth/LoginLdapPage/LoginLDAPPage.tsx b/frontend/src/pages/auth/LoginLdapPage/LoginLDAPPage.tsx
index 1227705ba..6a7b6eb96 100644
--- a/frontend/src/pages/auth/LoginLdapPage/LoginLDAPPage.tsx
+++ b/frontend/src/pages/auth/LoginLdapPage/LoginLDAPPage.tsx
@@ -72,7 +72,14 @@ export const LoginLdapPage = () => {
       </Helmet>
       <Link to="/">
         <div className="mb-4 mt-20 flex justify-center">
-          <img src="/images/gradientLogo.svg" height={90} width={120} alt="Infisical logo" />
+          <img
+            src="/images/gradientLogo.svg"
+            style={{
+              height: "90px",
+              width: "120px"
+            }}
+            alt="Infisical logo"
+          />
         </div>
       </Link>
       <div className="mx-auto w-full max-w-md md:px-6">
diff --git a/frontend/src/pages/auth/LoginPage/LoginPage.tsx b/frontend/src/pages/auth/LoginPage/LoginPage.tsx
index 2ba9093ad..8ecf29424 100644
--- a/frontend/src/pages/auth/LoginPage/LoginPage.tsx
+++ b/frontend/src/pages/auth/LoginPage/LoginPage.tsx
@@ -70,7 +70,14 @@ export const LoginPage = () => {
       </Helmet>
       <Link to="/">
         <div className="mb-4 mt-20 flex justify-center">
-          <img src="/images/gradientLogo.svg" height={90} width={120} alt="Infisical logo" />
+          <img
+            src="/images/gradientLogo.svg"
+            style={{
+              height: "90px",
+              width: "120px"
+            }}
+            alt="Infisical logo"
+          />
         </div>
       </Link>
       <div className="pb-28">{renderView()}</div>;
diff --git a/frontend/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx b/frontend/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx
index ef71e4209..ba28c3871 100644
--- a/frontend/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx
+++ b/frontend/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx
@@ -154,7 +154,11 @@ export const PasswordResetPage = () => {
       <p className="mb-8 flex justify-center bg-gradient-to-br from-sky-400 to-primary bg-clip-text text-center text-4xl font-semibold text-transparent">
         Confirm your email
       </p>
-      <img src="/images/envelope.svg" height={262} width={410} alt="verify email" />
+      <img
+        src="/images/envelope.svg"
+        style={{ height: "262px", width: "410px" }}
+        alt="verify email"
+      />
       <div className="mx-auto mb-2 mt-4 flex max-h-24 max-w-md flex-col items-center justify-center px-4 text-lg md:p-2">
         <Button
           onClick={async () => {
diff --git a/frontend/src/pages/auth/SelectOrgPage/SelectOrgPage.tsx b/frontend/src/pages/auth/SelectOrgPage/SelectOrgPage.tsx
index 21fb70bf7..c546c7c5e 100644
--- a/frontend/src/pages/auth/SelectOrgPage/SelectOrgPage.tsx
+++ b/frontend/src/pages/auth/SelectOrgPage/SelectOrgPage.tsx
@@ -226,7 +226,14 @@ export const SelectOrganizationPage = () => {
         <div className="mx-auto mt-20 w-fit rounded-lg border-2 border-mineshaft-500 p-10 shadow-lg">
           <Link href="/">
             <div className="mb-4 flex justify-center">
-              <img src="/images/gradientLogo.svg" height={90} width={120} alt="Infisical logo" />
+              <img
+                src="/images/gradientLogo.svg"
+                style={{
+                  height: "90px",
+                  width: "120px"
+                }}
+                alt="Infisical logo"
+              />
             </div>
           </Link>
           <form className="mx-auto flex w-full flex-col items-center justify-center">
diff --git a/frontend/src/pages/auth/SignUpInvitePage/SignUpInvitePage.tsx b/frontend/src/pages/auth/SignUpInvitePage/SignUpInvitePage.tsx
index 80d918f9a..3252bc9f9 100644
--- a/frontend/src/pages/auth/SignUpInvitePage/SignUpInvitePage.tsx
+++ b/frontend/src/pages/auth/SignUpInvitePage/SignUpInvitePage.tsx
@@ -227,7 +227,11 @@ export const SignupInvitePage = () => {
       <p className="mb-6 flex justify-center text-center text-4xl font-semibold text-primary-100">
         Confirm your email
       </p>
-      <img src="/images/dragon-signupinvite.svg" height={262} width={410} alt="verify email" />
+      <img
+        src="/images/dragon-signupinvite.svg"
+        style={{ height: "262px", width: "410px" }}
+        alt="verify email"
+      />
       <div className="mx-auto mb-2 mt-10 flex max-h-24 max-w-md flex-col items-center justify-center px-4 text-lg md:p-2">
         <Button
           onClick={async () => {
diff --git a/frontend/src/pages/auth/SignUpSsoPage/SignUpSsoPage.tsx b/frontend/src/pages/auth/SignUpSsoPage/SignUpSsoPage.tsx
index b7872e612..6c2788845 100644
--- a/frontend/src/pages/auth/SignUpSsoPage/SignUpSsoPage.tsx
+++ b/frontend/src/pages/auth/SignUpSsoPage/SignUpSsoPage.tsx
@@ -80,7 +80,14 @@ export const SignupSsoPage = () => {
         <meta name="og:description" content={t("signup.og-description") as string} />
       </Helmet>
       <div className="mb-4 mt-20 flex justify-center">
-        <img src="/images/gradientLogo.svg" height={90} width={120} alt="Infisical Logo" />
+        <img
+          src="/images/gradientLogo.svg"
+          style={{
+            height: "90px",
+            width: "120px"
+          }}
+          alt="Infisical Logo"
+        />
       </div>
       <div>{renderView()}</div>;
     </div>
diff --git a/frontend/src/pages/auth/VerifyEmailPage/VerifyEmailPage.tsx b/frontend/src/pages/auth/VerifyEmailPage/VerifyEmailPage.tsx
index 04d25f477..418529bdc 100644
--- a/frontend/src/pages/auth/VerifyEmailPage/VerifyEmailPage.tsx
+++ b/frontend/src/pages/auth/VerifyEmailPage/VerifyEmailPage.tsx
@@ -53,7 +53,14 @@ export const VerifyEmailPage = () => {
       </Helmet>
       <Link to="/">
         <div className="mb-8 mt-20 flex cursor-pointer justify-center">
-          <img src="/images/biglogo.png" height={90} width={120} alt="long logo" />
+          <img
+            src="/images/biglogo.png"
+            style={{
+              height: "90px",
+              width: "120px"
+            }}
+            alt="long logo"
+          />
         </div>
       </Link>
       {step === 1 && (
diff --git a/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionList.tsx b/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionList.tsx
index 5072db7ac..285144875 100644
--- a/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionList.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionList.tsx
@@ -33,8 +33,10 @@ export const AppConnectionsSelect = ({ onSelect }: Props) => {
         >
           <img
             src={`/images/integrations/${APP_CONNECTION_MAP[option.app].image}`}
-            height={50}
-            width={50}
+            style={{
+              height: "50px",
+              width: "50px"
+            }}
             className="mt-auto"
             alt={`${APP_CONNECTION_MAP[option.app].name} logo`}
           />
diff --git a/frontend/src/pages/public/ViewSharedSecretByIDPage/route.tsx b/frontend/src/pages/public/ViewSharedSecretByIDPage/route.tsx
index 39135c4ac..f50368503 100644
--- a/frontend/src/pages/public/ViewSharedSecretByIDPage/route.tsx
+++ b/frontend/src/pages/public/ViewSharedSecretByIDPage/route.tsx
@@ -1,14 +1,17 @@
-import { createFileRoute } from "@tanstack/react-router";
+import { createFileRoute, stripSearchParams } from "@tanstack/react-router";
 import { zodValidator } from "@tanstack/zod-adapter";
 import { z } from "zod";
 
 import { ViewSharedSecretByIDPage } from "./ViewSharedSecretByIDPage";
 
 const SharedSecretByIDPageQuerySchema = z.object({
-  key: z.string()
+  key: z.string().catch("")
 });
 
 export const Route = createFileRoute("/shared/secret/$secretId")({
   component: ViewSharedSecretByIDPage,
-  validateSearch: zodValidator(SharedSecretByIDPageQuerySchema)
+  validateSearch: zodValidator(SharedSecretByIDPageQuerySchema),
+  search: {
+    middlewares: [stripSearchParams({ key: "" })]
+  }
 });
diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretDropzone/CopySecretsFromBoard.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretDropzone/CopySecretsFromBoard.tsx
index e11987f71..3a3924f81 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretDropzone/CopySecretsFromBoard.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretDropzone/CopySecretsFromBoard.tsx
@@ -78,7 +78,7 @@ export const CopySecretsFromBoard = ({
   const selectedEnvSlug = watch("environment");
   const [debouncedEnvCopySecretPath] = useDebounce(envCopySecPath);
 
-  const { data: secrets, isLoading: isSecretsLoading } = useGetProjectSecrets({
+  const { data: secrets, isPending: isSecretsLoading } = useGetProjectSecrets({
     workspaceId,
     environment: selectedEnvSlug.slug,
     secretPath: debouncedEnvCopySecretPath,
diff --git a/frontend/src/pages/secret-manager/integrations/AzureAppConfigurationOauthCallbackPage/AzureAppConfigurationOauthCallbackPage.tsx b/frontend/src/pages/secret-manager/integrations/AzureAppConfigurationOauthCallbackPage/AzureAppConfigurationOauthCallbackPage.tsx
index 87931f3b9..1b21d92ae 100644
--- a/frontend/src/pages/secret-manager/integrations/AzureAppConfigurationOauthCallbackPage/AzureAppConfigurationOauthCallbackPage.tsx
+++ b/frontend/src/pages/secret-manager/integrations/AzureAppConfigurationOauthCallbackPage/AzureAppConfigurationOauthCallbackPage.tsx
@@ -10,7 +10,7 @@ export const AzureAppConfigurationOauthCallbackPage = () => {
   const { mutateAsync } = useAuthorizeIntegration();
 
   const { code, state } = useSearch({
-    from: ROUTE_PATHS.SecretManager.Integratons.HerokuOauthCallbackPage.id
+    from: ROUTE_PATHS.SecretManager.Integratons.AzureAppConfigurationsOauthCallbackPage.id
   });
   const { currentWorkspace } = useWorkspace();