diff --git a/apps/web/app/(app)/premium/Pricing.tsx b/apps/web/app/(app)/premium/Pricing.tsx
index 98166693ce..1f46bfca50 100644
--- a/apps/web/app/(app)/premium/Pricing.tsx
+++ b/apps/web/app/(app)/premium/Pricing.tsx
@@ -91,7 +91,7 @@ export default function Pricing(props: PricingProps) {
             {userPremiumTier && (
               <>
                 <Button className="ml-2" asChild>
-                  <Link href={env.NEXT_PUBLIC_APP_HOME_PATH}>
+                  <Link href="/setup">
                     <SparklesIcon className="mr-2 h-4 w-4" />
                     Go to app
                   </Link>
diff --git a/apps/web/app/(landing)/welcome-redirect/page.tsx b/apps/web/app/(landing)/welcome-redirect/page.tsx
index a8541e138f..dfa4429796 100644
--- a/apps/web/app/(landing)/welcome-redirect/page.tsx
+++ b/apps/web/app/(landing)/welcome-redirect/page.tsx
@@ -1,17 +1,14 @@
 import { redirect } from "next/navigation";
 import { auth } from "@/utils/auth";
-import { env } from "@/env";
 import prisma from "@/utils/prisma";
 
 export default async function WelcomeRedirectPage(props: {
-  searchParams: Promise<{ question?: string; force?: boolean }>;
+  searchParams: Promise<{ force?: boolean }>;
 }) {
   const searchParams = await props.searchParams;
   const session = await auth();
 
   if (!session?.user) redirect("/login");
-  if (!env.NEXT_PUBLIC_POSTHOG_ONBOARDING_SURVEY_ID)
-    redirect(env.NEXT_PUBLIC_APP_HOME_PATH);
 
   const user = await prisma.user.findUnique({
     where: { id: session.user.id },
@@ -19,9 +16,7 @@ export default async function WelcomeRedirectPage(props: {
   });
 
   if (!user) redirect("/login");
-
-  if (!searchParams.force && user.completedOnboardingAt)
-    redirect(env.NEXT_PUBLIC_APP_HOME_PATH);
-
+  if (searchParams.force) redirect("/onboarding");
+  if (user.completedOnboardingAt) redirect("/setup");
   redirect("/onboarding");
 }
diff --git a/apps/web/app/(landing)/welcome/form.tsx b/apps/web/app/(landing)/welcome/form.tsx
index 268393cbe2..2811c0e4b7 100644
--- a/apps/web/app/(landing)/welcome/form.tsx
+++ b/apps/web/app/(landing)/welcome/form.tsx
@@ -221,7 +221,7 @@ export const OnboardingForm = (props: { questionIndex: number }) => {
 //         submitPosthog(responses);
 //         posthog.capture("survey dismissed", { $survey_id: surveyId });
 //         await completedOnboardingAction();
-//         router.push(env.NEXT_PUBLIC_APP_HOME_PATH);
+//         router.push("/setup");
 //       }}
 //     >
 //       Skip Onboarding
diff --git a/apps/web/env.ts b/apps/web/env.ts
index 8683be8144..4cbba70c4f 100644
--- a/apps/web/env.ts
+++ b/apps/web/env.ts
@@ -176,7 +176,6 @@ export const env = createEnv({
         return value.split(",");
       }),
     NEXT_PUBLIC_OLLAMA_MODEL: z.string().optional(),
-    NEXT_PUBLIC_APP_HOME_PATH: z.string().default("/setup"),
     NEXT_PUBLIC_DUB_REFER_DOMAIN: z.string().optional(),
     NEXT_PUBLIC_DISABLE_REFERRAL_SIGNATURE: z.coerce
       .boolean()
@@ -235,7 +234,6 @@ export const env = createEnv({
     NEXT_PUBLIC_AXIOM_TOKEN: process.env.NEXT_PUBLIC_AXIOM_TOKEN,
     NEXT_PUBLIC_LOG_SCOPES: process.env.NEXT_PUBLIC_LOG_SCOPES,
     NEXT_PUBLIC_OLLAMA_MODEL: process.env.NEXT_PUBLIC_OLLAMA_MODEL,
-    NEXT_PUBLIC_APP_HOME_PATH: process.env.NEXT_PUBLIC_APP_HOME_PATH,
     NEXT_PUBLIC_DUB_REFER_DOMAIN: process.env.NEXT_PUBLIC_DUB_REFER_DOMAIN,
     NEXT_PUBLIC_DISABLE_REFERRAL_SIGNATURE:
       process.env.NEXT_PUBLIC_DISABLE_REFERRAL_SIGNATURE,
diff --git a/turbo.json b/turbo.json
index 488ac5c298..beffb3c649 100644
--- a/turbo.json
+++ b/turbo.json
@@ -125,7 +125,6 @@
         "NEXT_PUBLIC_AXIOM_DATASET",
         "NEXT_PUBLIC_AXIOM_TOKEN",
         "NEXT_PUBLIC_OLLAMA_MODEL",
-        "NEXT_PUBLIC_APP_HOME_PATH",
         "NEXT_PUBLIC_DUB_REFER_DOMAIN",
         "NEXT_PUBLIC_USE_AEONIK_FONT"
       ],
diff --git a/version.txt b/version.txt
index 9070e05095..982923389d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v2.21.18
+v2.21.19