diff --git a/packages/shared/src/lib/log.ts b/packages/shared/src/lib/log.ts
index a8d5fe8a94..8d418c39ce 100644
--- a/packages/shared/src/lib/log.ts
+++ b/packages/shared/src/lib/log.ts
@@ -84,7 +84,6 @@ export enum Origin {
   Leaderboard = 'leaderboard',
   // Onboarding v2
   OnboardingModal = 'onboarding modal',
-  OnboardingFeedEnd = 'onboarding feed end',
   // Auth
   BetterAuthEmailLogin = 'betterauth email login',
   BetterAuthEmailLoginBoot = 'betterauth email login boot',
@@ -474,7 +473,6 @@ export enum TargetType {
   HighlightsCard = 'highlights card',
   AdvertiseHereCta = 'advertise here cta',
   // Onboarding v2
-  HeroCta = 'hero cta',
   SignupChooser = 'signup chooser',
   SignupPrompt = 'signup prompt',
   ProfileImport = 'profile import',
diff --git a/packages/webapp/components/onboarding/OnboardingV2.tsx b/packages/webapp/components/onboarding/OnboardingV2.tsx
index 45bfdb5cb3..b25351e869 100644
--- a/packages/webapp/components/onboarding/OnboardingV2.tsx
+++ b/packages/webapp/components/onboarding/OnboardingV2.tsx
@@ -52,11 +52,6 @@ import {
 
 import { ChromeIcon } from '@dailydotdev/shared/src/components/icons/Browser/Chrome';
 import { MagicIcon } from '@dailydotdev/shared/src/components/icons/Magic';
-import { TerminalIcon } from '@dailydotdev/shared/src/components/icons/Terminal';
-import { HomeIcon } from '@dailydotdev/shared/src/components/icons/Home';
-import { HotIcon } from '@dailydotdev/shared/src/components/icons/Hot';
-import { EyeIcon } from '@dailydotdev/shared/src/components/icons/Eye';
-import { SquadIcon } from '@dailydotdev/shared/src/components/icons/Squad';
 import { VIcon } from '@dailydotdev/shared/src/components/icons/V';
 import { StarIcon } from '@dailydotdev/shared/src/components/icons/Star';
 import { IconSize } from '@dailydotdev/shared/src/components/Icon';
@@ -87,74 +82,6 @@ import { OnboardingV2Styles } from './OnboardingV2Styles';
 import { useOnboardingAnimations } from './useOnboardingAnimations';
 import { OnboardingChooserGrid } from './OnboardingChooserGrid';
 
-type RisingTag = {
-  label: string;
-  left: string;
-  delay: string;
-  duration: string;
-  driftX: number;
-};
-
-const RISING_TAGS_DESKTOP: RisingTag[] = [
-  { label: 'React', left: '8%', delay: '0s', duration: '14s', driftX: 12 },
-  { label: 'AI & ML', left: '28%', delay: '1.2s', duration: '15s', driftX: -8 },
-  {
-    label: 'System Design',
-    left: '52%',
-    delay: '0.6s',
-    duration: '14.5s',
-    driftX: 10,
-  },
-  { label: 'Docker', left: '78%', delay: '2s', duration: '13.8s', driftX: -14 },
-  {
-    label: 'TypeScript',
-    left: '18%',
-    delay: '3.4s',
-    duration: '15.2s',
-    driftX: 8,
-  },
-  {
-    label: 'Next.js',
-    left: '88%',
-    delay: '2.8s',
-    duration: '14.4s',
-    driftX: -10,
-  },
-  {
-    label: 'Python',
-    left: '42%',
-    delay: '4.2s',
-    duration: '14.8s',
-    driftX: -6,
-  },
-  {
-    label: 'Kubernetes',
-    left: '66%',
-    delay: '5s',
-    duration: '14.2s',
-    driftX: 12,
-  },
-];
-
-const RISING_TAGS_MOBILE: RisingTag[] = [
-  { label: 'React', left: '10%', delay: '0s', duration: '13.5s', driftX: 8 },
-  {
-    label: 'AI & ML',
-    left: '55%',
-    delay: '1.5s',
-    duration: '14s',
-    driftX: -10,
-  },
-  { label: 'Docker', left: '30%', delay: '3s', duration: '13s', driftX: 6 },
-  {
-    label: 'TypeScript',
-    left: '75%',
-    delay: '4.5s',
-    duration: '14.5s',
-    driftX: -8,
-  },
-];
-
 export type OnboardingStep =
   | 'hero'
   | 'prompt'
@@ -253,21 +180,16 @@ export const OnboardingV2 = (): ReactElement => {
   const [showMobileAppPopup, setShowMobileAppPopup] = useState(false);
   const {
     mounted,
-    tagsReady,
-    feedVisible,
     heroRef,
     confettiParticles,
     isEdgeBrowser,
     extensionImages,
   } = useOnboardingAnimations(step);
-  const [aiPrompt, setAiPrompt] = usePersistentContext<string>(
-    ONBOARDING_AI_PROMPT_KEY,
-    '',
-  );
-  const [extensionSeen, setExtensionSeen] = usePersistentContext<boolean>(
-    ONBOARDING_EXTENSION_SEEN_KEY,
-    false,
-  );
+  const [aiPrompt, setAiPrompt, isAiPromptFetched] =
+    usePersistentContext<string>(ONBOARDING_AI_PROMPT_KEY, '', undefined, '');
+  const [extensionSeen, setExtensionSeen, isExtensionSeenFetched] =
+    usePersistentContext<boolean>(ONBOARDING_EXTENSION_SEEN_KEY, false);
+  const shouldShowExtension = showExtensionCta && !extensionSeen;
   const [authDisplay, setAuthDisplay] = useState(AuthDisplay.OnboardingSignup);
   const [isLoginFlow, setIsLoginFlow] = useState(false);
   const [acceptedMarketing, setAcceptedMarketing] = useState(true);
@@ -280,9 +202,12 @@ export const OnboardingV2 = (): ReactElement => {
   >(null);
   const [importBodyHeight, setImportBodyHeight] = useState<number | null>(null);
   const [importExiting, setImportExiting] = useState(false);
-  const [signupContext, setSignupContext] = usePersistentContext<
-    'github' | 'ai' | null
-  >(ONBOARDING_SIGNUP_CONTEXT_KEY, null, ['github', 'ai']);
+  const [signupContext, setSignupContext, isSignupContextFetched] =
+    usePersistentContext<'github' | 'ai' | null>(
+      ONBOARDING_SIGNUP_CONTEXT_KEY,
+      null,
+      ['github', 'ai'],
+    );
   const pageRef = useRef<HTMLDivElement>(null);
   const importTimersRef = useRef<ReturnType<typeof setTimeout>[]>([]);
   const importBodyContentRef = useRef<HTMLDivElement>(null);
@@ -299,14 +224,6 @@ export const OnboardingV2 = (): ReactElement => {
     [activeFeedName],
   );
 
-  const openSignup = useCallback(
-    (context: 'github' | 'ai') => {
-      setSignupContext(context);
-      setStep('prompt');
-    },
-    [setSignupContext],
-  );
-
   const clearImportTimers = useCallback(() => {
     importTimersRef.current.forEach(clearTimeout);
     importTimersRef.current = [];
@@ -487,7 +404,7 @@ export const OnboardingV2 = (): ReactElement => {
             setImportExiting(true);
             trackTimer(() => {
               setImportExiting(false);
-              setStep(showExtensionCta ? 'extension' : 'complete');
+              setStep(shouldShowExtension ? 'extension' : 'complete');
             }, 350);
           }, 600);
         }, FINISHING_ANIMATION_MS);
@@ -501,7 +418,7 @@ export const OnboardingV2 = (): ReactElement => {
       completeAction,
       router,
       trackTimer,
-      showExtensionCta,
+      shouldShowExtension,
     ],
   );
 
@@ -516,6 +433,8 @@ export const OnboardingV2 = (): ReactElement => {
     if (
       !isAuthReady ||
       isAuthenticating ||
+      !isAiPromptFetched ||
+      !isSignupContextFetched ||
       (
         [
           'auth',
@@ -556,12 +475,12 @@ export const OnboardingV2 = (): ReactElement => {
         return;
       }
 
-      if (extensionSeen || !showExtensionCta) {
-        setStep('complete');
-      } else {
-        setStep('extension');
+      if (!isExtensionSeenFetched) {
+        return;
       }
 
+      setStep(shouldShowExtension ? 'extension' : 'complete');
+
       return;
     }
 
@@ -610,7 +529,10 @@ export const OnboardingV2 = (): ReactElement => {
     isLoggedIn,
     isOnboardingActionsReady,
     isOnboardingComplete,
-    extensionSeen,
+    isExtensionSeenFetched,
+    isAiPromptFetched,
+    isSignupContextFetched,
+    shouldShowExtension,
     aiPrompt,
     signupContext,
     step,
@@ -618,7 +540,6 @@ export const OnboardingV2 = (): ReactElement => {
     setSignupContext,
     startImportFlowGithub,
     startAiProcessing,
-    showExtensionCta,
   ]);
 
   useEffect(() => {
@@ -722,7 +643,10 @@ export const OnboardingV2 = (): ReactElement => {
   return (
     <div
       ref={pageRef}
-      className="onb-page relative tablet:pt-16 laptop:pl-11"
+      className={classNames(
+        'onb-page relative tablet:pt-16',
+        step === 'hero' && 'flex min-h-dvh flex-col',
+      )}
       role="presentation"
     >
       <OnboardingV2Styles />
@@ -756,46 +680,17 @@ export const OnboardingV2 = (): ReactElement => {
         )}
       </header>
 
-      {/* ── Dummy Sidebar (laptop only) ── */}
-      <aside className="pointer-events-none fixed left-0 top-16 z-2 hidden h-[calc(100vh-theme(space.16))] w-11 select-none flex-col border-r border-border-subtlest-tertiary bg-background-default laptop:flex">
-        <nav className="flex flex-col items-center gap-0.5 pt-3">
-          <div className="flex h-9 w-full items-center justify-center">
-            <HomeIcon
-              className="h-5 w-5 text-text-disabled"
-              secondary={false}
-            />
-          </div>
-          <div className="flex h-9 w-full items-center justify-center">
-            <SquadIcon
-              className="h-5 w-5 text-text-disabled"
-              secondary={false}
-            />
-          </div>
-          <div className="flex h-9 w-full items-center justify-center">
-            <HotIcon className="h-5 w-5 text-text-disabled" secondary={false} />
-          </div>
-          <div className="flex h-9 w-full items-center justify-center">
-            <EyeIcon className="h-5 w-5 text-text-disabled" secondary={false} />
-          </div>
-          <div className="flex h-9 w-full items-center justify-center">
-            <TerminalIcon
-              className="h-5 w-5 text-text-disabled"
-              secondary={false}
-            />
-          </div>
-        </nav>
-      </aside>
-
       {/* ── Hero ── */}
       <section
         ref={heroRef}
         className={classNames(
           'onb-hero relative overflow-hidden py-2 tablet:py-8',
           step === 'complete' && 'hidden',
+          step === 'hero' && 'flex flex-1 flex-col',
         )}
         style={{ '--scroll-y': '0' } as React.CSSProperties}
       >
-        <div className="z-10 relative mx-auto mb-3 flex w-full max-w-[63.75rem] items-center justify-between px-4 tablet:hidden">
+        <div className="z-10 relative mx-auto mb-6 flex w-full max-w-[63.75rem] shrink-0 items-center justify-between px-4 tablet:hidden">
           <Logo
             compact
             position={LogoPosition.Relative}
@@ -846,57 +741,21 @@ export const OnboardingV2 = (): ReactElement => {
           <div className="onb-float-1 bg-accent-cheese-default/20 absolute left-[25%] top-[70%] h-1 w-1 rounded-full" />
           <div className="onb-float-2 bg-accent-cabbage-default/20 absolute left-[85%] top-[45%] h-1 w-1 rounded-full" />
           <div className="onb-float-3 bg-white/20 absolute left-[40%] top-[30%] h-0.5 w-0.5 rounded-full" />
-          {tagsReady &&
-            RISING_TAGS_DESKTOP.map((tag) => (
-              <span
-                key={tag.label}
-                className="onb-rising-tag absolute bottom-0 hidden whitespace-nowrap rounded-8 border border-white/[0.08] bg-white/[0.03] px-2.5 py-1 text-text-quaternary typo-caption1 tablet:block"
-                style={
-                  {
-                    left: tag.left,
-                    '--tag-delay': tag.delay,
-                    '--tag-duration': tag.duration,
-                    '--tag-drift-x': `${tag.driftX}px`,
-                  } as React.CSSProperties
-                }
-              >
-                {tag.label}
-              </span>
-            ))}
         </div>
 
         {/* Single radial hero glow */}
         <div className="onb-hero-radial pointer-events-none absolute inset-x-0 top-0 h-[26rem]" />
 
-        {/* Centered text content */}
-        <div className="relative mx-auto max-w-[63.75rem] px-4 text-center laptop:px-6">
+        {/* Title + chooser */}
+        <div
+          className={classNames(
+            'z-10 relative mx-auto w-full max-w-[63.75rem] px-4 text-center laptop:px-6',
+            step === 'hero' && 'flex flex-1 flex-col justify-center',
+          )}
+        >
           <div className="pointer-events-none mb-1 hidden h-[1.5rem] tablet:block" />
-          {/* Mobile-only rising tags */}
-          <div
-            className={classNames(
-              'pointer-events-none relative mb-4 h-[4.5rem] overflow-hidden tablet:hidden',
-            )}
-          >
-            {tagsReady &&
-              RISING_TAGS_MOBILE.map((tag) => (
-                <span
-                  key={`mob-${tag.label}`}
-                  className="onb-rising-tag absolute bottom-0 whitespace-nowrap rounded-8 border border-white/[0.06] bg-white/[0.02] px-2 py-0.5 text-text-quaternary typo-caption2"
-                  style={
-                    {
-                      left: tag.left,
-                      '--tag-delay': tag.delay,
-                      '--tag-duration': tag.duration,
-                      '--tag-drift-x': `${tag.driftX}px`,
-                    } as React.CSSProperties
-                  }
-                >
-                  {tag.label}
-                </span>
-              ))}
-          </div>
 
-          {/* Headline */}
+          {/* Headline — slightly smaller than typo-mega1 on tablet */}
           <div
             className={classNames(
               'transition-all duration-700 ease-out',
@@ -904,140 +763,52 @@ export const OnboardingV2 = (): ReactElement => {
             )}
             style={{ transitionDelay: '200ms' }}
           >
-            <h1 className="mx-auto max-w-[20rem] font-bold leading-[1.12] tracking-tight typo-title1 tablet:max-w-[48rem] tablet:leading-[1.08] tablet:typo-mega1">
+            <h1 className="mx-auto max-w-[22rem] font-bold leading-[1.3] tracking-tight typo-title1 tablet:max-w-[48rem] tablet:leading-[1.22] tablet:typo-large-title">
               <span className="text-text-primary">
-                Staying updated shouldn&apos;t be hard
+                Staying sharp shouldn&apos;t be hard
               </span>
               <br />
               <span className="onb-gradient-text bg-clip-text text-transparent">
-                Get your personalized dev feed
+                A dev feed built around your stack
               </span>
             </h1>
           </div>
 
-          {/* Subtext */}
-          <div
-            className={classNames(
-              'transition-all duration-700 ease-out',
-              mounted ? 'translate-y-0 opacity-100' : 'translate-y-3 opacity-0',
-            )}
-            style={{ transitionDelay: '400ms' }}
-          >
-            <p
-              className="mx-auto mt-4 max-w-[20rem] text-text-secondary typo-callout tablet:mt-5 tablet:max-w-[36rem] tablet:typo-body"
-              style={{ lineHeight: '1.65' }}
+          {step === 'hero' && (
+            <div
+              className={classNames(
+                'relative mx-auto mt-6 w-full max-w-[58rem] px-0 tablet:mt-8',
+                mounted
+                  ? 'translate-y-0 opacity-100'
+                  : 'translate-y-3 opacity-0',
+                'transition-all duration-700 ease-out',
+              )}
+              style={{ transitionDelay: '350ms' }}
             >
-              Millions of developers rely on daily.dev for tech news, tools, and
-              discussions that actually matter. Tailored to your stack from day
-              one.
-            </p>
-          </div>
-
-          {/* Hero CTA group */}
-          <div
-            className={classNames(
-              'mt-7 transition-all duration-700 ease-out',
-              mounted ? 'translate-y-0 opacity-100' : 'translate-y-3 opacity-0',
-            )}
-            style={{ transitionDelay: '500ms' }}
-          >
-            <div className="relative mx-auto flex w-full flex-col items-center justify-center gap-3 tablet:w-fit tablet:flex-row">
-              <div className="onb-btn-glow pointer-events-none absolute -inset-3 rounded-20 bg-white/[0.06] blur-xl" />
-              <button
-                type="button"
-                disabled={isImporting}
-                onClick={() => {
-                  logEvent({
-                    event_name: LogEvent.Click,
-                    target_type: TargetType.HeroCta,
-                    target_id: TargetId.GitHub,
-                  });
+              <OnboardingChooserGrid
+                aiPrompt={aiPrompt}
+                onAiPromptChange={setAiPrompt}
+                canStartAiFlow={canStartAiFlow}
+                isImporting={isImporting}
+                origin={Origin.Onboarding}
+                onGithubClick={() => {
                   if (isLoggedIn) {
                     startImportFlowGithub();
                   } else {
                     initiateGithubAuth();
                   }
                 }}
-                className={classNames(
-                  'onb-btn-shine focus-visible:ring-white/20 group relative flex w-full items-center justify-center gap-2.5 overflow-hidden rounded-14 bg-white px-7 py-3.5 font-bold text-black transition-all duration-300 typo-callout hover:-translate-y-1 hover:shadow-[0_8px_30px_rgba(255,255,255,0.12)] focus-visible:outline-none focus-visible:ring-2 tablet:w-auto',
-                  isImporting && 'opacity-60 cursor-not-allowed',
-                )}
-              >
-                <GitHubIcon secondary size={IconSize.XSmall} />
-                One-click setup
-                <svg
-                  width="14"
-                  height="14"
-                  viewBox="0 0 24 24"
-                  fill="none"
-                  className="text-black/30 transition-transform duration-300 group-hover:translate-x-0.5"
-                >
-                  <path
-                    d="M5 12h14M12 5l7 7-7 7"
-                    stroke="currentColor"
-                    strokeWidth="2"
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  />
-                </svg>
-              </button>
-              <button
-                type="button"
-                onClick={() => {
-                  logEvent({
-                    event_name: LogEvent.Click,
-                    target_type: TargetType.HeroCta,
-                    target_id: TargetId.AI,
-                  });
-                  openSignup('ai');
+                onAiSubmit={() => {
+                  if (isLoggedIn) {
+                    startAiProcessing();
+                  } else {
+                    setSignupContext('ai');
+                    openSignupAuth();
+                  }
                 }}
-                className="focus-visible:ring-white/20 group relative flex w-full items-center justify-center gap-2.5 overflow-hidden rounded-14 border border-white/[0.12] bg-white/[0.04] px-6 py-3.5 font-bold text-text-primary backdrop-blur-md transition-all duration-300 typo-callout hover:-translate-y-1 hover:border-white/[0.22] hover:bg-white/[0.08] hover:shadow-[0_10px_35px_rgba(0,0,0,0.28)] focus-visible:outline-none focus-visible:ring-2 tablet:w-auto"
-              >
-                <MagicIcon
-                  secondary
-                  size={IconSize.Size16}
-                  className="text-text-primary"
-                />
-                Set up with AI
-                <svg
-                  width="14"
-                  height="14"
-                  viewBox="0 0 24 24"
-                  fill="none"
-                  className="text-text-quaternary transition-transform duration-300 group-hover:translate-x-0.5"
-                >
-                  <path
-                    d="M5 12h14M12 5l7 7-7 7"
-                    stroke="currentColor"
-                    strokeWidth="2"
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  />
-                </svg>
-              </button>
+              />
             </div>
-          </div>
-
-          {/* Mobile-only bottom rising tags */}
-          <div className="pointer-events-none relative mt-5 h-[4.5rem] overflow-hidden tablet:hidden">
-            {tagsReady &&
-              RISING_TAGS_MOBILE.map((tag) => (
-                <span
-                  key={`mob-bot-${tag.label}`}
-                  className="onb-rising-tag absolute bottom-0 whitespace-nowrap rounded-8 border border-white/[0.06] bg-white/[0.02] px-2 py-0.5 text-text-quaternary typo-caption2"
-                  style={
-                    {
-                      left: `${100 - parseInt(tag.left, 10)}%`,
-                      '--tag-delay': `${parseFloat(tag.delay) + 2}s`,
-                      '--tag-duration': tag.duration,
-                      '--tag-drift-x': `${-tag.driftX}px`,
-                    } as React.CSSProperties
-                  }
-                >
-                  {tag.label}
-                </span>
-              ))}
-          </div>
+          )}
         </div>
       </section>
 
@@ -1306,77 +1077,23 @@ export const OnboardingV2 = (): ReactElement => {
         </div>
       )}
 
-      {/* ── Feed ── */}
-      <div
-        className={classNames(
-          'onb-feed-stage relative min-h-[50vh] transition-[opacity,transform] duration-500 ease-out laptop:px-10',
-          // eslint-disable-next-line no-nested-ternary
-          step === 'complete'
-            ? 'onb-feed-unlocked translate-y-0 opacity-100'
-            : feedVisible
-            ? 'translate-y-0 opacity-100'
-            : 'pointer-events-none translate-y-2 opacity-0',
-        )}
-      >
-        <SearchProvider>
-          <FeedLayoutProvider>
-            <ActiveFeedNameContext.Provider value={activeFeedNameValue}>
-              <MainFeedLayout
-                feedName={showPersonalizedFeed ? 'default' : 'popular'}
-                isSearchOn={false}
-                hideFeedActionButtons
-                disableBriefCard
-              />
-            </ActiveFeedNameContext.Provider>
-          </FeedLayoutProvider>
-        </SearchProvider>
-        {/* ── Inline chooser panel at feed end ── */}
-        {step === 'hero' && (
-          <div className="relative -mt-48 tablet:-mt-64">
-            <div
-              className="pointer-events-none absolute inset-x-0 top-0 h-full"
-              style={{
-                background:
-                  'linear-gradient(to bottom, transparent 0%, var(--theme-background-default) 25%, var(--theme-background-default) 100%)',
-              }}
-              aria-hidden
-            />
-            <div className="relative mx-auto w-full max-w-[58rem] px-4 pb-12 pt-6 tablet:px-8">
-              <div className="mb-6 text-center tablet:mb-8">
-                <p className="mb-2 text-text-secondary typo-callout tablet:typo-body">
-                  You just explored the global feed.
-                </p>
-                <h3 className="font-bold text-text-primary typo-title2 tablet:typo-title1">
-                  Now build a feed that is truly yours
-                </h3>
-              </div>
-
-              <OnboardingChooserGrid
-                aiPrompt={aiPrompt}
-                onAiPromptChange={setAiPrompt}
-                canStartAiFlow={canStartAiFlow}
-                isImporting={isImporting}
-                origin={Origin.OnboardingFeedEnd}
-                onGithubClick={() => {
-                  if (isLoggedIn) {
-                    startImportFlowGithub();
-                  } else {
-                    initiateGithubAuth();
-                  }
-                }}
-                onAiSubmit={() => {
-                  if (isLoggedIn) {
-                    startAiProcessing();
-                  } else {
-                    setSignupContext('ai');
-                    openSignupAuth();
-                  }
-                }}
-              />
-            </div>
-          </div>
-        )}
-      </div>
+      {/* ── Feed (only on complete step — chooser lives in hero) ── */}
+      {step === 'complete' && (
+        <div className="onb-feed-stage relative min-h-[50vh] laptop:px-10">
+          <SearchProvider>
+            <FeedLayoutProvider>
+              <ActiveFeedNameContext.Provider value={activeFeedNameValue}>
+                <MainFeedLayout
+                  feedName={showPersonalizedFeed ? 'default' : 'popular'}
+                  isSearchOn={false}
+                  hideFeedActionButtons
+                  disableBriefCard
+                />
+              </ActiveFeedNameContext.Provider>
+            </FeedLayoutProvider>
+          </SearchProvider>
+        </div>
+      )}
 
       {step !== 'complete' && (
         <div className="relative z-1 mx-auto mt-4 flex w-full max-w-[48rem] justify-center px-5 pb-4 mobileL:px-6">
@@ -1574,7 +1291,7 @@ export const OnboardingV2 = (): ReactElement => {
                   pathname: `${webappUrl}onboarding`,
                   query: { ...router.query, step: 'complete' },
                 });
-                setStep(showExtensionCta ? 'extension' : 'complete');
+                setStep(shouldShowExtension ? 'extension' : 'complete');
               }}
               className="mx-auto mt-6 rounded-14 bg-white px-8 py-3 font-bold text-black transition-all duration-200 typo-callout hover:-translate-y-0.5 hover:shadow-[0_8px_28px_rgba(255,255,255,0.12)] disabled:cursor-not-allowed disabled:opacity-40"
             >
diff --git a/packages/webapp/components/onboarding/OnboardingV2Styles.tsx b/packages/webapp/components/onboarding/OnboardingV2Styles.tsx
index c47d49c61d..335d1a7492 100644
--- a/packages/webapp/components/onboarding/OnboardingV2Styles.tsx
+++ b/packages/webapp/components/onboarding/OnboardingV2Styles.tsx
@@ -11,12 +11,6 @@ export const OnboardingV2Styles = (): ReactElement => (
       display: none !important;
     }
 
-    .onb-feed-stage:not(.onb-feed-unlocked) article:nth-of-type(n + 19) {
-      display: none !important;
-    }
-    .onb-feed-stage:not(.onb-feed-unlocked) article:nth-of-type(18) ~ div {
-      display: none !important;
-    }
     .onb-hero .onb-float-1,
     .onb-hero .onb-float-2,
     .onb-hero .onb-float-3 {
@@ -26,8 +20,6 @@ export const OnboardingV2Styles = (): ReactElement => (
       padding-top: 0 !important;
     }
 
-    /* fade-out handled by .onb-revealed nth-of-type rules below */
-
     /* ─── HERO PARALLAX ─── */
     .onb-hero {
       --scroll-y: 0;
@@ -64,41 +56,6 @@ export const OnboardingV2Styles = (): ReactElement => (
       opacity: calc(1 - var(--scroll-y) * 0.001);
     }
 
-    /* ─── RISING TAG CLOUD ─── */
-    @keyframes onb-tag-rise {
-      0% {
-        opacity: 0;
-        transform: translate3d(0, 0, 0) scale(0.88);
-      }
-      6% {
-        opacity: 0.6;
-        transform: translate3d(calc(var(--tag-drift-x, 0px) * 0.1), -6vh, 0)
-          scale(0.95);
-      }
-      40% {
-        opacity: 0.45;
-        transform: translate3d(calc(var(--tag-drift-x, 0px) * 0.55), -28vh, 0)
-          scale(1);
-      }
-      75% {
-        opacity: 0.15;
-        transform: translate3d(calc(var(--tag-drift-x, 0px) * 0.85), -52vh, 0)
-          scale(1.01);
-      }
-      100% {
-        opacity: 0;
-        transform: translate3d(var(--tag-drift-x, 0px), -70vh, 0) scale(1.02);
-      }
-    }
-    .onb-rising-tag {
-      opacity: 0;
-      animation: onb-tag-rise var(--tag-duration, 14s) linear infinite;
-      animation-delay: var(--tag-delay, 0s);
-      contain: layout style;
-      will-change: transform, opacity;
-      transform: translateZ(0);
-    }
-
     /* ─── SHIMMER ─── */
     .onb-shimmer {
       position: relative;
@@ -166,17 +123,6 @@ export const OnboardingV2Styles = (): ReactElement => (
         opacity: 1;
       }
     }
-    .onb-feed-stage:not(.onb-feed-unlocked) article.onb-revealed {
-      opacity: 1 !important;
-      transform: translateY(0) scale(1) !important;
-    }
-    .onb-feed-stage:not(.onb-feed-unlocked) article.onb-revealed:hover {
-      transform: translateY(0) scale(1) !important;
-      box-shadow: 0 12px 40px rgba(0, 0, 0, 0.25),
-        0 0 0 1px rgba(255, 255, 255, 0.03) !important;
-      border-color: rgba(255, 255, 255, 0.06) !important;
-    }
-
     /* ─── CHIP POP ─── */
     @keyframes onb-chip-pop {
       0% {
@@ -531,12 +477,6 @@ export const OnboardingV2Styles = (): ReactElement => (
       animation: onb-celebration-sparkle 1.2s ease-out forwards;
     }
 
-    .onb-feed-unlocked article {
-      opacity: 1 !important;
-      transform: none !important;
-      pointer-events: auto !important;
-    }
-
     /* ─── AI PROCESSING ORB ─── */
     @keyframes onb-ai-orb-breathe {
       0%,
@@ -899,72 +839,6 @@ export const OnboardingV2Styles = (): ReactElement => (
       box-shadow: 0 28px 90px rgba(0, 0, 0, 0.62);
     }
 
-    /* ─── FEED ARTICLE SCROLL-REVEAL ─── */
-    .onb-feed-stage:not(.onb-feed-unlocked) article {
-      opacity: 0;
-      transform: translateY(0.75rem) scale(0.995);
-      transition: opacity 0.38s cubic-bezier(0.16, 1, 0.3, 1),
-        transform 0.38s cubic-bezier(0.16, 1, 0.3, 1), box-shadow 0.25s ease,
-        border-color 0.25s ease !important;
-      transition-delay: var(--reveal-delay, 0ms);
-    }
-
-    /* ─── FEED FADE-OUT GRADIENT (bottom of visible articles) ─── */
-    .onb-feed-stage:not(.onb-feed-unlocked)
-      article:nth-of-type(13).onb-revealed {
-      opacity: 0.88 !important;
-    }
-    .onb-feed-stage:not(.onb-feed-unlocked)
-      article:nth-of-type(14).onb-revealed {
-      opacity: 0.72 !important;
-    }
-    .onb-feed-stage:not(.onb-feed-unlocked)
-      article:nth-of-type(15).onb-revealed {
-      opacity: 0.52 !important;
-    }
-    .onb-feed-stage:not(.onb-feed-unlocked)
-      article:nth-of-type(16).onb-revealed {
-      opacity: 0.32 !important;
-    }
-    .onb-feed-stage:not(.onb-feed-unlocked)
-      article:nth-of-type(17).onb-revealed {
-      opacity: 0.15 !important;
-    }
-    .onb-feed-stage:not(.onb-feed-unlocked)
-      article:nth-of-type(18).onb-revealed {
-      opacity: 0.05 !important;
-    }
-
-    @media (max-width: 63.9375rem) {
-      .onb-feed-stage:not(.onb-feed-unlocked) article:nth-of-type(n + 11) {
-        display: none !important;
-      }
-      .onb-feed-stage:not(.onb-feed-unlocked) article:nth-of-type(10) ~ div {
-        display: none !important;
-      }
-
-      .onb-feed-stage:not(.onb-feed-unlocked) article.onb-revealed:hover {
-        box-shadow: none !important;
-      }
-
-      .onb-feed-stage:not(.onb-feed-unlocked)
-        article:nth-of-type(7).onb-revealed {
-        opacity: 0.88 !important;
-      }
-      .onb-feed-stage:not(.onb-feed-unlocked)
-        article:nth-of-type(8).onb-revealed {
-        opacity: 0.65 !important;
-      }
-      .onb-feed-stage:not(.onb-feed-unlocked)
-        article:nth-of-type(9).onb-revealed {
-        opacity: 0.38 !important;
-      }
-      .onb-feed-stage:not(.onb-feed-unlocked)
-        article:nth-of-type(10).onb-revealed {
-        opacity: 0.12 !important;
-      }
-    }
-
     /* ─── TOPIC PILLS (no interaction) ─── */
     .onb-marquee span {
       pointer-events: none;
@@ -983,8 +857,6 @@ export const OnboardingV2Styles = (): ReactElement => (
       }
     }
 
-    /* mobile rising tags already handled by .onb-rising-tag */
-
     /* ─── MOBILE MODAL SLIDE-UP ─── */
     @keyframes onb-modal-slide-up {
       from {
@@ -1019,7 +891,6 @@ export const OnboardingV2Styles = (): ReactElement => (
     }
 
     /* ─── OFF-SCREEN ANIMATION PAUSING ─── */
-    .onb-hero-offscreen .onb-rising-tag,
     .onb-hero-offscreen .onb-hero-radial,
     .onb-hero-offscreen .onb-float-1,
     .onb-hero-offscreen .onb-float-2,
@@ -1028,8 +899,7 @@ export const OnboardingV2Styles = (): ReactElement => (
     .onb-hero-offscreen .onb-btn-glow {
       animation-play-state: paused !important;
     }
-    .onb-hero-offscreen .onb-hero-radial,
-    .onb-hero-offscreen .onb-rising-tag {
+    .onb-hero-offscreen .onb-hero-radial {
       will-change: auto !important;
     }
 
@@ -1091,8 +961,7 @@ export const OnboardingV2Styles = (): ReactElement => (
       .onb-sparkle,
       .onb-confetti-star,
       .onb-eng-pulse,
-      .onb-eng-floater,
-      .onb-rising-tag {
+      .onb-eng-floater {
         animation: none !important;
         opacity: 1 !important;
       }
diff --git a/packages/webapp/components/onboarding/useOnboardingAnimations.ts b/packages/webapp/components/onboarding/useOnboardingAnimations.ts
index ba38d56ad7..018b3baefc 100644
--- a/packages/webapp/components/onboarding/useOnboardingAnimations.ts
+++ b/packages/webapp/components/onboarding/useOnboardingAnimations.ts
@@ -49,10 +49,8 @@ function buildConfettiParticles(): ConfettiParticle[] {
 }
 
 export function useOnboardingAnimations(step: OnboardingStep) {
-  // ── Mount + tag reveal + feed visible state ──
+  // ── Mount state ──
   const [mounted, setMounted] = useState(false);
-  const [tagsReady, setTagsReady] = useState(false);
-  const [feedVisible, setFeedVisible] = useState(false);
 
   // ── Refs ──
   const heroRef = useRef<HTMLElement>(null);
@@ -65,34 +63,6 @@ export function useOnboardingAnimations(step: OnboardingStep) {
     return () => cancelAnimationFrame(raf);
   }, []);
 
-  // ── Tag reveal timing ──
-  useEffect(() => {
-    if (!mounted) {
-      return undefined;
-    }
-    let idleTimer: number | null = null;
-    let revealTimer: ReturnType<typeof setTimeout> | null = null;
-
-    const revealTags = () => {
-      revealTimer = setTimeout(() => setTagsReady(true), 180);
-    };
-
-    if ('requestIdleCallback' in window) {
-      idleTimer = window.requestIdleCallback(revealTags, { timeout: 1400 });
-    } else {
-      revealTimer = setTimeout(() => setTagsReady(true), 1200);
-    }
-
-    return () => {
-      if (idleTimer !== null && 'cancelIdleCallback' in window) {
-        window.cancelIdleCallback(idleTimer);
-      }
-      if (revealTimer !== null) {
-        window.clearTimeout(revealTimer);
-      }
-    };
-  }, [mounted]);
-
   // ── Body overflow management ──
   useEffect(() => {
     const isModalOpen = step !== 'hero' && step !== 'complete';
@@ -110,77 +80,6 @@ export function useOnboardingAnimations(step: OnboardingStep) {
     };
   }, [step]);
 
-  // ── Feed article reveal + intersection observer ──
-  useEffect(() => {
-    if (!mounted) {
-      return undefined;
-    }
-
-    const timer = window.setTimeout(() => {
-      setFeedVisible(true);
-    }, 400);
-
-    const observer = new IntersectionObserver(
-      (entries) => {
-        entries.forEach((entry) => {
-          if (entry.isIntersecting) {
-            (entry.target as HTMLElement).classList.add('onb-revealed');
-            observer.unobserve(entry.target);
-          }
-        });
-      },
-      { rootMargin: '0px 0px -40px 0px', threshold: 0.05 },
-    );
-
-    const observeFeedArticles = () => {
-      document
-        .querySelectorAll<HTMLElement>('.onb-feed-stage article')
-        .forEach((article, i) => {
-          if (!article.dataset.onbRevealDelay) {
-            article.style.setProperty(
-              '--reveal-delay',
-              `${Math.min(i * 60, 400)}ms`,
-            );
-            // eslint-disable-next-line no-param-reassign
-            article.dataset.onbRevealDelay = 'true';
-          }
-
-          if (article.classList.contains('onb-revealed')) {
-            return;
-          }
-
-          observer.observe(article);
-        });
-    };
-
-    observeFeedArticles();
-
-    const mutationObserver = new MutationObserver((mutations) => {
-      const hasNewArticles = mutations.some((mutation) =>
-        Array.from(mutation.addedNodes).some(
-          (node) =>
-            node instanceof HTMLElement &&
-            (node.tagName === 'ARTICLE' || node.querySelector('article')),
-        ),
-      );
-      if (hasNewArticles) {
-        observeFeedArticles();
-      }
-    });
-    const feedContainer =
-      document.querySelector('.onb-feed-stage') ?? document.body;
-    mutationObserver.observe(feedContainer, {
-      childList: true,
-      subtree: true,
-    });
-
-    return () => {
-      window.clearTimeout(timer);
-      mutationObserver.disconnect();
-      observer.disconnect();
-    };
-  }, [mounted]);
-
   // ── Parallax scroll ──
   useEffect(() => {
     const prefersReduced = window.matchMedia(
@@ -246,8 +145,6 @@ export function useOnboardingAnimations(step: OnboardingStep) {
 
   return {
     mounted,
-    tagsReady,
-    feedVisible,
     heroRef,
     confettiParticles,
     isEdgeBrowser,