diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template
index af80b04fa..4775dcbfa 100644
--- a/nginx/nginx.conf.template
+++ b/nginx/nginx.conf.template
@@ -11,6 +11,11 @@ http {
 
         client_max_body_size ${FILE_SIZE_LIMIT};
 
+        add_header X-Content-Type-Options    "nosniff" always;
+        add_header Referrer-Policy           "no-referrer-when-downgrade" always;
+        add_header Permissions-Policy        "interest-cohort=()" always;
+        add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
+
         location / {
             proxy_pass http://web:3000/;
         }
@@ -20,6 +25,7 @@ http {
         }
 
         location /spaces/ {
+            rewrite ^/spaces/?$ /spaces/login break;
             proxy_pass http://space:3000/spaces/;
         }
 
@@ -27,4 +33,4 @@ http {
             proxy_pass http://plane-minio:9000/uploads/;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/space/components/accounts/sign-in.tsx b/space/components/accounts/sign-in.tsx
index d3c29103d..c6a151d44 100644
--- a/space/components/accounts/sign-in.tsx
+++ b/space/components/accounts/sign-in.tsx
@@ -33,7 +33,7 @@ export const SignInView = observer(() => {
   const onSignInSuccess = (response: any) => {
     const isOnboarded = response?.user?.onboarding_step?.profile_complete || false;
 
-    const nextPath = router.asPath.includes("next_path") ? router.asPath.split("/?next_path=")[1] : "/";
+    const nextPath = router.asPath.includes("next_path") ? router.asPath.split("/?next_path=")[1] : "/login";
 
     userStore.setCurrentUser(response?.user);
 
@@ -41,7 +41,7 @@ export const SignInView = observer(() => {
       router.push(`/onboarding?next_path=${nextPath}`);
       return;
     }
-    router.push((nextPath ?? "/").toString());
+    router.push((nextPath ?? "/login").toString());
   };
 
   const handleGoogleSignIn = async ({ clientId, credential }: any) => {
diff --git a/space/components/views/index.ts b/space/components/views/index.ts
index 84d36cd29..f54d11bdd 100644
--- a/space/components/views/index.ts
+++ b/space/components/views/index.ts
@@ -1 +1 @@
-export * from "./home";
+export * from "./login";
diff --git a/space/components/views/home.tsx b/space/components/views/login.tsx
similarity index 88%
rename from space/components/views/home.tsx
rename to space/components/views/login.tsx
index 999fce073..d01a22681 100644
--- a/space/components/views/home.tsx
+++ b/space/components/views/login.tsx
@@ -4,7 +4,7 @@ import { useMobxStore } from "lib/mobx/store-provider";
 // components
 import { SignInView, UserLoggedIn } from "components/accounts";
 
-export const HomeView = observer(() => {
+export const LoginView = observer(() => {
   const { user: userStore } = useMobxStore();
 
   if (!userStore.currentUser) return <SignInView />;
diff --git a/space/pages/index.tsx b/space/pages/index.tsx
deleted file mode 100644
index fe0b7d33a..000000000
--- a/space/pages/index.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from "react";
-
-// components
-import { HomeView } from "components/views";
-
-const HomePage = () => <HomeView />;
-
-export default HomePage;
diff --git a/space/pages/login/index.tsx b/space/pages/login/index.tsx
new file mode 100644
index 000000000..a80eff873
--- /dev/null
+++ b/space/pages/login/index.tsx
@@ -0,0 +1,8 @@
+import React from "react";
+
+// components
+import { LoginView } from "components/views";
+
+const LoginPage = () => <LoginView />;
+
+export default LoginPage;
\ No newline at end of file