diff --git a/docs/_layouts/static-site-main.html b/docs/_layouts/static-site-main.html
index 508cf61efe2d..fef31885980b 100644
--- a/docs/_layouts/static-site-main.html
+++ b/docs/_layouts/static-site-main.html
@@ -4,17 +4,7 @@
 
 <div class="site-container">
   <div id="site-header"></div>
-  {% if page.nightlyOf %}
-  <aside class="warning">
-    <div class='icon'></div>
-    <div class='content'>
-    This is a nightly documentation. The content of this page may not be
-    consistent with the current stable version of language. Click
-    <a href="{{ page.nightlyOf }}">here</a> to find the stable version of this
-    page.
-    </div>
-  </aside>
-  {% endif %} {{ content }}
+  {{ content }}
   <div class="divider" />
   <nav class="arrow-navigation" aria-label="Page navigation">
     {% if page.previous %}
diff --git a/docs/sidebar.nightly.template.yml b/docs/sidebar.nightly.template.yml
new file mode 100644
index 000000000000..42e0692f060f
--- /dev/null
+++ b/docs/sidebar.nightly.template.yml
@@ -0,0 +1,63 @@
+index: index.md
+subsection:
+  - title: Reference
+    directory: docs/reference
+    # Embed sidebar.reference.yml, performed by `generateScalaDocumentation` sbt task
+  - title: Contributing
+    directory: docs/contributing
+    index: contributing/index.md
+    subsection:
+      - page: contributing/getting-started.md
+      - page: contributing/setting-up-your-ide.md
+      - index: contributing/issues/diagnosing-your-issue.md
+        subsection:
+          - page: contributing/issues/reproduce.md
+          - page: contributing/issues/cause.md
+          - page: contributing/issues/areas.md
+      - index: contributing/debugging/debugging.md
+        subsection:
+          - page: contributing/debugging/ide-debugging.md
+          - page: contributing/debugging/inspection.md
+          - page: contributing/debugging/other-debugging.md
+      - page: contributing/testing.md
+      - page: contributing/scaladoc.md
+      - page: contributing/community-build.md
+      - page: contributing/sending-in-a-pr.md
+      - page: contributing/cheatsheet.md
+      - title: Procedures
+        directory: procedures
+        index: contributing/procedures/index.md
+        subsection:
+          - page: contributing/procedures/release.md
+          - page: contributing/procedures/vulpix.md
+      - title: High Level Architecture
+        directory: architecture
+        index: contributing/architecture/index.md
+        subsection:
+          - page: contributing/architecture/lifecycle.md
+          - page: contributing/architecture/context.md
+          - page: contributing/architecture/phases.md
+          - page: contributing/architecture/types.md
+          - page: contributing/architecture/time.md
+          - page: contributing/architecture/symbols.md
+  - title: Internals
+    directory: docs/internals
+    index: internals/index.md
+    subsection:
+      - page: internals/backend.md
+      - page: internals/classpaths.md
+      - page: internals/contexts.md
+      - page: internals/dotc-scalac.md
+      - page: internals/higher-kinded-v2.md
+      - page: internals/overall-structure.md
+      - page: internals/explicit-nulls.md
+      - page: internals/periods.md
+      - page: internals/syntax.md
+      - page: internals/type-system.md
+      - page: internals/dotty-internals-1-notes.md
+      - page: internals/debug-macros.md
+      - page: internals/gadts.md
+      - page: internals/coverage.md
+      - page: internals/best-effort-compilation.md
+  - page: release-notes-0.1.2.md  # Referenced from https://www.scala-lang.org/blog/2017/05/31/first-dotty-milestone-release.html
+    hidden: true
diff --git a/docs/sidebar.yml b/docs/sidebar.yml
index f0ca5433d649..414c1438f0d5 100644
--- a/docs/sidebar.yml
+++ b/docs/sidebar.yml
@@ -1,240 +1,178 @@
-index: index.md
+index: reference/overview.md
 subsection:
-  - title: Reference
-    directory: docs/reference
-    index: reference/overview.md
+  - title: New Types
+    index: reference/new-types/new-types.md
     subsection:
-      - title: New Types
-        index: reference/new-types/new-types.md
-        subsection:
-          - page: reference/new-types/intersection-types.md
-          - page: reference/new-types/intersection-types-spec.md
-            hidden: true
-          - page: reference/new-types/union-types.md
-          - page: reference/new-types/union-types-spec.md
-            hidden: true
-          - page: reference/new-types/type-lambdas.md
-          - page: reference/new-types/type-lambdas-spec.md
-            hidden: true
-          - page: reference/new-types/match-types.md
-          - page: reference/new-types/dependent-function-types.md
-          - page: reference/new-types/dependent-function-types-spec.md
-            hidden: true
-          - page: reference/new-types/polymorphic-function-types.md
-      - title: Enums
-        index: reference/enums/enums-index.md
-        subsection:
-          - page: reference/enums/enums.md
-          - page: reference/enums/adts.md
-          - page: reference/enums/desugarEnums.md
-      - title: Contextual Abstractions
-        index: reference/contextual/contextual.md
-        directory: contextual
-        subsection:
-          - page: reference/contextual/givens.md
-          - page: reference/contextual/using-clauses.md
-          - page: reference/contextual/context-bounds.md
-          - page: reference/contextual/deferred-givens.md
-          - page: reference/contextual/given-imports.md
-          - page: reference/contextual/more-givens.md
-          - page: reference/contextual/previous-givens.md
-            hidden: true
-          - page: reference/contextual/extension-methods.md
-          - page: reference/contextual/right-associative-extension-methods.md
-          - page: reference/contextual/type-classes.md
-          - page: reference/contextual/derivation.md
-          - page: reference/contextual/derivation-macro.md
-          - page: reference/contextual/multiversal-equality.md
-          - page: reference/contextual/context-functions.md
-          - page: reference/contextual/context-functions-spec.md
-            hidden: true
-          - page: reference/contextual/conversions.md
-          - page: reference/contextual/by-name-context-parameters.md
-          - page: reference/contextual/relationship-implicits.md
-      - title: Metaprogramming
-        index: reference/metaprogramming/metaprogramming.md
-        subsection:
-          - page: reference/metaprogramming/inline.md
-          - page: reference/metaprogramming/compiletime-ops.md
-          - page: reference/metaprogramming/macros.md
-          - page: reference/metaprogramming/macros-spec.md
-            hidden: true
-          - page: reference/metaprogramming/simple-smp.md # description of a simplified metaprogramming language, this might not be the best place for it
-          - page: reference/metaprogramming/staging.md
-          - page: reference/metaprogramming/reflection.md
-          - page: reference/metaprogramming/tasty-inspect.md
-      - title: Other New Features
-        index: reference/other-new-features/other-new-features.md
-        subsection:
-          - page: reference/other-new-features/trait-parameters.md
-          - page: reference/other-new-features/transparent-traits.md
-          - page: reference/other-new-features/creator-applications.md
-          - page: reference/other-new-features/export.md
-          - page: reference/other-new-features/opaques.md
-          - page: reference/other-new-features/opaques-details.md
-          - page: reference/other-new-features/named-tuples.md
-          - page: reference/other-new-features/open-classes.md
-          - page: reference/other-new-features/parameter-untupling.md
-          - page: reference/other-new-features/parameter-untupling-spec.md
-            hidden: true
-          - page: reference/other-new-features/kind-polymorphism.md
-          - page: reference/other-new-features/matchable.md
-          - page: reference/other-new-features/threadUnsafe-annotation.md
-          - page: reference/other-new-features/targetName.md
-          - page: reference/other-new-features/control-syntax.md
-          - page: reference/other-new-features/indentation.md
-          - page: reference/other-new-features/safe-initialization.md
-          - page: reference/other-new-features/type-test.md
-          - page: reference/other-new-features/experimental-defs.md
-          - page: reference/other-new-features/preview-defs.md
-          - page: reference/other-new-features/binary-literals.md
-          - page: reference/other-new-features/toplevel-definitions.md
-      - title: Other Changed Features
-        directory: changed-features
-        index: reference/changed-features/changed-features.md
-        subsection:
-          - page: reference/changed-features/numeric-literals.md
-          - page: reference/changed-features/structural-types.md
-          - page: reference/changed-features/structural-types-spec.md
-            hidden: true
-          - page: reference/changed-features/operators.md
-          - page: reference/changed-features/wildcards.md
-          - page: reference/changed-features/imports.md
-          - page: reference/changed-features/type-inference.md
-          - page: reference/changed-features/implicit-resolution.md
-          - page: reference/changed-features/implicit-conversions.md
-          - page: reference/changed-features/implicit-conversions-spec.md
-            hidden: true
-          - page: reference/changed-features/overload-resolution.md
-          - page: reference/changed-features/match-syntax.md
-          - page: reference/changed-features/vararg-splices.md
-          - page: reference/changed-features/pattern-bindings.md
-          - page: reference/changed-features/pattern-matching.md
-          - page: reference/changed-features/eta-expansion.md
-          - page: reference/changed-features/eta-expansion-spec.md
-            hidden: true
-          - page: reference/changed-features/compiler-plugins.md
-          - page: reference/changed-features/lazy-vals-init.md
-          - page: reference/changed-features/main-functions.md
-          - page: reference/changed-features/interpolation-escapes.md
-      - title: Dropped Features
-        index: reference/dropped-features/dropped-features.md
-        subsection:
-          - page: reference/dropped-features/delayed-init.md
-          - page: reference/dropped-features/macros.md
-          - page: reference/dropped-features/existential-types.md
-          - page: reference/dropped-features/type-projection.md
-          - page: reference/dropped-features/do-while.md
-          - page: reference/dropped-features/procedure-syntax.md
-          - page: reference/dropped-features/early-initializers.md
-          - page: reference/dropped-features/class-shadowing.md
-          - page: reference/dropped-features/class-shadowing-spec.md
-            hidden: true
-          - page: reference/dropped-features/limit22.md
-          - page: reference/dropped-features/xml.md
-          - page: reference/dropped-features/symlits.md
-          - page: reference/dropped-features/auto-apply.md
-          - page: reference/dropped-features/weak-conformance.md
-          - page: reference/dropped-features/weak-conformance-spec.md
-            hidden: true
-          - page: reference/dropped-features/nonlocal-returns.md
-          - page: reference/dropped-features/this-qualifier.md
-          - page: reference/dropped-features/wildcard-init.md
-      - title: Preview Features
-        directory: preview
-        index: reference/preview/overview.md
-        subsection:
-          - page: reference/preview/better-fors.md
-      - title: Experimental Features
-        directory: experimental
-        index: reference/experimental/overview.md
-        subsection:
-          - page: reference/experimental/fewer-braces.md
-            hidden: true
-          - page: reference/experimental/canthrow.md
-          - page: reference/experimental/erased-defs.md
-          - page: reference/experimental/erased-defs-spec.md
-            hidden: true
-          - page: reference/experimental/named-typeargs.md
-          - page: reference/experimental/named-typeargs-spec.md
-            hidden: true
-          - page: reference/experimental/numeric-literals.md
-          - page: reference/experimental/explicit-nulls.md
-          - page: reference/experimental/main-annotation.md
-          - page: reference/experimental/into.md
-          - page: reference/experimental/cc.md
-          - page: reference/experimental/cc-advanced.md
-            hidden: true
-          - page: reference/experimental/purefuns.md
-          - page: reference/experimental/tupled-function.md
-          - page: reference/experimental/modularity.md
-          - page: reference/experimental/typeclasses.md
-          - page: reference/experimental/runtimeChecked.md
-          - page: reference/experimental/unrolled-defs.md
-          - page: reference/experimental/package-object-values.md
-      - page: reference/syntax.md
-      - title: Language Versions
-        index: reference/language-versions/language-versions.md
-        subsection:
-          - page: reference/language-versions/source-compatibility.md
-          - page: reference/language-versions/binary-compatibility.md
-      - page: reference/soft-modifier.md
-      - page: reference/features-classification.md
-  - title: Contributing
-    directory: docs/contributing
-    index: contributing/index.md
+      - page: reference/new-types/intersection-types.md
+      - page: reference/new-types/intersection-types-spec.md
+        hidden: true
+      - page: reference/new-types/union-types.md
+      - page: reference/new-types/union-types-spec.md
+        hidden: true
+      - page: reference/new-types/type-lambdas.md
+      - page: reference/new-types/type-lambdas-spec.md
+        hidden: true
+      - page: reference/new-types/match-types.md
+      - page: reference/new-types/dependent-function-types.md
+      - page: reference/new-types/dependent-function-types-spec.md
+        hidden: true
+      - page: reference/new-types/polymorphic-function-types.md
+  - title: Enums
+    index: reference/enums/enums-index.md
     subsection:
-      - page: contributing/getting-started.md
-      - page: contributing/setting-up-your-ide.md
-      - index: contributing/issues/diagnosing-your-issue.md
-        subsection:
-          - page: contributing/issues/reproduce.md
-          - page: contributing/issues/cause.md
-          - page: contributing/issues/areas.md
-      - index: contributing/debugging/debugging.md
-        subsection:
-          - page: contributing/debugging/ide-debugging.md
-          - page: contributing/debugging/inspection.md
-          - page: contributing/debugging/other-debugging.md
-      - page: contributing/testing.md
-      - page: contributing/scaladoc.md
-      - page: contributing/community-build.md
-      - page: contributing/sending-in-a-pr.md
-      - page: contributing/cheatsheet.md
-      - title: Procedures
-        directory: procedures
-        index: contributing/procedures/index.md
-        subsection:
-          - page: contributing/procedures/release.md
-          - page: contributing/procedures/vulpix.md
-      - title: High Level Architecture
-        directory: architecture
-        index: contributing/architecture/index.md
-        subsection:
-          - page: contributing/architecture/lifecycle.md
-          - page: contributing/architecture/context.md
-          - page: contributing/architecture/phases.md
-          - page: contributing/architecture/types.md
-          - page: contributing/architecture/time.md
-          - page: contributing/architecture/symbols.md
-  - title: Internals
-    directory: docs/internals
-    index: internals/index.md
+      - page: reference/enums/enums.md
+      - page: reference/enums/adts.md
+      - page: reference/enums/desugarEnums.md
+  - title: Contextual Abstractions
+    index: reference/contextual/contextual.md
+    directory: contextual
     subsection:
-      - page: internals/backend.md
-      - page: internals/classpaths.md
-      - page: internals/contexts.md
-      - page: internals/dotc-scalac.md
-      - page: internals/higher-kinded-v2.md
-      - page: internals/overall-structure.md
-      - page: internals/explicit-nulls.md
-      - page: internals/periods.md
-      - page: internals/syntax.md
-      - page: internals/type-system.md
-      - page: internals/dotty-internals-1-notes.md
-      - page: internals/debug-macros.md
-      - page: internals/gadts.md
-      - page: internals/coverage.md
-      - page: internals/best-effort-compilation.md
-  - page: release-notes-0.1.2.md
-    hidden: true
+      - page: reference/contextual/givens.md
+      - page: reference/contextual/using-clauses.md
+      - page: reference/contextual/context-bounds.md
+      - page: reference/contextual/deferred-givens.md
+      - page: reference/contextual/given-imports.md
+      - page: reference/contextual/more-givens.md
+      - page: reference/contextual/previous-givens.md
+        hidden: true
+      - page: reference/contextual/extension-methods.md
+      - page: reference/contextual/right-associative-extension-methods.md
+      - page: reference/contextual/type-classes.md
+      - page: reference/contextual/derivation.md
+      - page: reference/contextual/derivation-macro.md
+      - page: reference/contextual/multiversal-equality.md
+      - page: reference/contextual/context-functions.md
+      - page: reference/contextual/context-functions-spec.md
+        hidden: true
+      - page: reference/contextual/conversions.md
+      - page: reference/contextual/by-name-context-parameters.md
+      - page: reference/contextual/relationship-implicits.md
+  - title: Metaprogramming
+    index: reference/metaprogramming/metaprogramming.md
+    subsection:
+      - page: reference/metaprogramming/inline.md
+      - page: reference/metaprogramming/compiletime-ops.md
+      - page: reference/metaprogramming/macros.md
+      - page: reference/metaprogramming/macros-spec.md
+        hidden: true
+      - page: reference/metaprogramming/simple-smp.md # description of a simplified metaprogramming language, this might not be the best place for it
+      - page: reference/metaprogramming/staging.md
+      - page: reference/metaprogramming/reflection.md
+      - page: reference/metaprogramming/tasty-inspect.md
+  - title: Other New Features
+    index: reference/other-new-features/other-new-features.md
+    subsection:
+      - page: reference/other-new-features/trait-parameters.md
+      - page: reference/other-new-features/transparent-traits.md
+      - page: reference/other-new-features/creator-applications.md
+      - page: reference/other-new-features/export.md
+      - page: reference/other-new-features/opaques.md
+      - page: reference/other-new-features/opaques-details.md
+      - page: reference/other-new-features/named-tuples.md
+      - page: reference/other-new-features/open-classes.md
+      - page: reference/other-new-features/parameter-untupling.md
+      - page: reference/other-new-features/parameter-untupling-spec.md
+        hidden: true
+      - page: reference/other-new-features/kind-polymorphism.md
+      - page: reference/other-new-features/matchable.md
+      - page: reference/other-new-features/threadUnsafe-annotation.md
+      - page: reference/other-new-features/targetName.md
+      - page: reference/other-new-features/control-syntax.md
+      - page: reference/other-new-features/indentation.md
+      - page: reference/other-new-features/safe-initialization.md
+      - page: reference/other-new-features/type-test.md
+      - page: reference/other-new-features/experimental-defs.md
+      - page: reference/other-new-features/preview-defs.md
+      - page: reference/other-new-features/binary-literals.md
+      - page: reference/other-new-features/toplevel-definitions.md
+  - title: Other Changed Features
+    directory: changed-features
+    index: reference/changed-features/changed-features.md
+    subsection:
+      - page: reference/changed-features/numeric-literals.md
+      - page: reference/changed-features/structural-types.md
+      - page: reference/changed-features/structural-types-spec.md
+        hidden: true
+      - page: reference/changed-features/operators.md
+      - page: reference/changed-features/wildcards.md
+      - page: reference/changed-features/imports.md
+      - page: reference/changed-features/type-inference.md
+      - page: reference/changed-features/implicit-resolution.md
+      - page: reference/changed-features/implicit-conversions.md
+      - page: reference/changed-features/implicit-conversions-spec.md
+        hidden: true
+      - page: reference/changed-features/overload-resolution.md
+      - page: reference/changed-features/match-syntax.md
+      - page: reference/changed-features/vararg-splices.md
+      - page: reference/changed-features/pattern-bindings.md
+      - page: reference/changed-features/pattern-matching.md
+      - page: reference/changed-features/eta-expansion.md
+      - page: reference/changed-features/eta-expansion-spec.md
+        hidden: true
+      - page: reference/changed-features/compiler-plugins.md
+      - page: reference/changed-features/lazy-vals-init.md
+      - page: reference/changed-features/main-functions.md
+      - page: reference/changed-features/interpolation-escapes.md
+  - title: Dropped Features
+    index: reference/dropped-features/dropped-features.md
+    subsection:
+      - page: reference/dropped-features/delayed-init.md
+      - page: reference/dropped-features/macros.md
+      - page: reference/dropped-features/existential-types.md
+      - page: reference/dropped-features/type-projection.md
+      - page: reference/dropped-features/do-while.md
+      - page: reference/dropped-features/procedure-syntax.md
+      - page: reference/dropped-features/early-initializers.md
+      - page: reference/dropped-features/class-shadowing.md
+      - page: reference/dropped-features/class-shadowing-spec.md
+        hidden: true
+      - page: reference/dropped-features/limit22.md
+      - page: reference/dropped-features/xml.md
+      - page: reference/dropped-features/symlits.md
+      - page: reference/dropped-features/auto-apply.md
+      - page: reference/dropped-features/weak-conformance.md
+      - page: reference/dropped-features/weak-conformance-spec.md
+        hidden: true
+      - page: reference/dropped-features/nonlocal-returns.md
+      - page: reference/dropped-features/this-qualifier.md
+      - page: reference/dropped-features/wildcard-init.md
+  - title: Preview Features
+    directory: preview
+    index: reference/preview/overview.md
+    subsection:
+      - page: reference/preview/better-fors.md
+  - title: Experimental Features
+    directory: experimental
+    index: reference/experimental/overview.md
+    subsection:
+      - page: reference/experimental/fewer-braces.md
+        hidden: true
+      - page: reference/experimental/canthrow.md
+      - page: reference/experimental/erased-defs.md
+      - page: reference/experimental/erased-defs-spec.md
+        hidden: true
+      - page: reference/experimental/named-typeargs.md
+      - page: reference/experimental/named-typeargs-spec.md
+        hidden: true
+      - page: reference/experimental/numeric-literals.md
+      - page: reference/experimental/explicit-nulls.md
+      - page: reference/experimental/main-annotation.md
+      - page: reference/experimental/into.md
+      - page: reference/experimental/cc.md
+      - page: reference/experimental/cc-advanced.md
+        hidden: true
+      - page: reference/experimental/purefuns.md
+      - page: reference/experimental/tupled-function.md
+      - page: reference/experimental/modularity.md
+      - page: reference/experimental/typeclasses.md
+      - page: reference/experimental/runtimeChecked.md
+      - page: reference/experimental/unrolled-defs.md
+      - page: reference/experimental/package-object-values.md
+  - page: reference/syntax.md
+  - title: Language Versions
+    index: reference/language-versions/language-versions.md
+    subsection:
+      - page: reference/language-versions/source-compatibility.md
+      - page: reference/language-versions/binary-compatibility.md
+  - page: reference/soft-modifier.md
+  - page: reference/features-classification.md
diff --git a/project/Build.scala b/project/Build.scala
index 55f41a512290..705dafd17b73 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -2416,11 +2416,17 @@ object Build {
   val testcasesSourceRoot = taskKey[String]("Root directory where tests sources are generated")
   val testDocumentationRoot = taskKey[String]("Root directory where tests documentation are stored")
   val generateSelfDocumentation = taskKey[Unit]("Generate example documentation")
-  // Note: the two tasks below should be one, but a bug in Tasty prevents that
-  val generateScalaDocumentation = inputKey[Unit]("Generate documentation for dotty lib")
-  val generateStableScala3Documentation  = inputKey[Unit]("Generate documentation for stable dotty lib")
   val generateTestcasesDocumentation  = taskKey[Unit]("Generate documentation for testcases, useful for debugging tests")
 
+  // Published on https://dotty.epfl.ch/ by nightly builds
+  // Contains additional internal/contributing docs
+  val generateScalaDocumentation = inputKey[Unit]("Generate documentation for snapshot release")
+
+  // Published on https://docs.scala-lang.org/api/all.html
+  val generateStableScala3Documentation  = inputKey[Unit]("Generate documentation for stable release")
+
+  // Published on https://docs.scala-lang.org/scala3/reference/
+  // Does not produce API docs, contains additional redirects for improved stablity
   val generateReferenceDocumentation = inputKey[Unit]("Generate language reference documentation for Scala 3")
 
   lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")).
@@ -2547,31 +2553,135 @@ object Build {
         val outputDirOverride = extraArgs.headOption.fold(identity[GenerationConfig](_))(newDir => {
           config: GenerationConfig => config.add(OutputDir(newDir))
         })
-        val justAPIArg: Option[String] = extraArgs.drop(1).find(_ == "--justAPI")
-        val justAPI = justAPIArg.fold(identity[GenerationConfig](_))(_ => {
-          config: GenerationConfig => config.remove[SiteRoot]
-        })
-        val overrideFunc = outputDirOverride.andThen(justAPI)
+        val justAPI = extraArgs.contains("--justAPI")
+        def justAPIOverride(config: GenerationConfig): GenerationConfig = {
+          if (!justAPI) config
+          else {
+            val siteRoot = IO.createTemporaryDirectory.getAbsolutePath()
+            config.add(SiteRoot(siteRoot))
+          }
+        }
+
+        // It would be the easiest to create a temp directory and apply patches there, but this task would be used frequently during development
+        // If we'd build using copy the emitted warnings would point developers to copies instead of original sources. Any fixes made in there would be lost.
+        // Instead let's apply revertable patches to the files as part snapshot doc generation process
+        abstract class SourcePatch(val file: File) {
+          def apply(): Unit
+          def revert(): Unit
+        }
+        val docs = file("docs")
+        val sourcePatches = if (justAPI) Nil else Seq(
+          // Generate full sidebar.yml based on template and reference content
+          new SourcePatch(docs / "sidebar.yml") {
+            val referenceSideBarCopy = IO.temporaryDirectory / "sidebar.yml.copy"
+            IO.copyFile(file, referenceSideBarCopy)
+
+            override def apply(): Unit = {
+              val yaml = new org.yaml.snakeyaml.Yaml()
+              type YamlObject = java.util.Map[String, AnyRef]
+              type YamlList[T] = java.util.List[T]
+              def loadYaml(file: File): YamlObject = {
+                val reader = Files.newBufferedReader(file.toPath)
+                try yaml.load(reader).asInstanceOf[YamlObject]
+                finally reader.close()
+              }
+              // Ensure to always operate on original (Map, List) instances
+              val template = loadYaml(docs / "sidebar.nightly.template.yml")
+              template.get("subsection")
+                .asInstanceOf[YamlList[YamlObject]]
+                .stream()
+                .filter(_.get("title") == "Reference")
+                .findFirst()
+                .orElseThrow(() => new IllegalStateException("Reference subsection not found in sidebar.nightly.template.yml"))
+                .putAll(loadYaml(referenceSideBarCopy))
+
+              val sidebarWriter = Files.newBufferedWriter(this.file.toPath)
+              try yaml.dump(template, sidebarWriter)
+              finally sidebarWriter.close()
+            }
+            override def revert(): Unit = IO.move(referenceSideBarCopy, file)
+          },
+          // Add patch about nightly version usage
+          new SourcePatch(docs / "_layouts" / "static-site-main.html") {
+            lazy val originalContent = IO.read(file)
+
+            val warningMessage = """{% if page.nightlyOf %}
+              |  <aside class="warning">
+              |    <div class='icon'></div>
+              |    <div class='content'>
+              |      This is a nightly documentation. The content of this page may not be consistent with the current stable version of language. 
+              |      Click <a href="{{ page.nightlyOf }}">here</a> to find the stable version of this page.
+              |    </div>
+              |  </aside>
+              |{% endif %}""".stripMargin
+
+            override def apply(): Unit = {
+              IO.write(file,
+                originalContent
+                .replace("{{ content }}", s"$warningMessage {{ content }}")
+                .ensuring(_.contains(warningMessage), "patch to static-site-main layout not applied!")
+              )
+            }
+            override def revert(): Unit = IO.write(file, originalContent)
+          }
+        )
 
         val config = Def.task {
-          overrideFunc(Scala3.value)
+          outputDirOverride
+          .andThen(justAPIOverride)
+          .apply(Scala3.value)
         }
 
         val writeAdditionalFiles = Def.task {
           val dest = file(config.value.get[OutputDir].get.value)
-          if (justAPIArg.isEmpty) {
+          if (!justAPI) {
             IO.write(dest / "versions" / "latest-nightly-base", majorVersion)
             // This file is used by GitHub Pages when the page is available in a custom domain
             IO.write(dest / "CNAME", "dotty.epfl.ch")
           }
         }
+        val applyPatches = Def.task {
+          streams.value.log.info(s"Generating snapshot scaladoc, would apply patches to ${sourcePatches.map(_.file)}")
+          sourcePatches.foreach(_.apply())
+        }
+        val revertPatches = Def.task {
+          streams.value.log.info(s"Generated snapshot scaladoc, reverting changes made to ${sourcePatches.map(_.file)}")
+          sourcePatches.foreach(_.revert())
+        }
 
-        writeAdditionalFiles.dependsOn(generateDocumentation(config))
+        writeAdditionalFiles.dependsOn(
+          revertPatches.dependsOn(
+            generateDocumentation(config)
+              .dependsOn(applyPatches)
+          )
+        )
       }.evaluated,
 
       generateStableScala3Documentation := Def.inputTaskDyn {
         val extraArgs = spaceDelimited("<version>").parsed
-        val config = stableScala3(extraArgs.head)
+        val version = baseVersion
+        // In the early days of scaladoc there was a practice to precompile artifacts of Scala 3 and generate docs using different version of scaladoc
+        // It's no longer needed after its stablisation.
+        // Allow to use explcit version check to detect using incorrect revision during release process
+        extraArgs.headOption.foreach { explicitVersion =>
+          assert(
+            explicitVersion == version,
+            s"Version of the build ($version) does not match the explicit verion ($explicitVersion)"
+          )
+        }
+
+        val docs = IO.createTemporaryDirectory
+        IO.copyDirectory(file("docs"), docs)
+        IO.delete(docs / "_blog")
+
+        val config = Def.task {
+          Scala3.value
+          .add(ProjectVersion(version))
+          .add(Revision(version))
+          .add(OutputDir(s"scaladoc/output/${version}"))
+          .add(SiteRoot(docs.getAbsolutePath))
+          .remove[ApiSubdirectory]
+        }
         generateDocumentation(config)
       }.evaluated,
 
@@ -2586,20 +2696,13 @@ object Build {
         generateStaticAssetsTask.value
 
         // Move all the source files to a temporary directory and apply some changes specific to the reference documentation
-        val temp = IO.createTemporaryDirectory
-        IO.copyDirectory(file("docs"), temp / "docs")
-        IO.delete(temp / "docs" / "_blog")
-
-        // Overwrite the main layout and the sidebar
-        IO.copyDirectory(
-          file("project") / "resources" / "referenceReplacements",
-          temp / "docs",
-          overwrite = true
-        )
+        val docs = IO.createTemporaryDirectory
+        IO.copyDirectory(file("docs"), docs)
+        IO.delete(docs / "_blog")
 
         // Add redirections from previously supported URLs, for some pages
         for (name <- Seq("changed-features", "contextual", "dropped-features", "metaprogramming", "other-new-features")) {
-          val path = temp / "docs" / "_docs" / "reference" / name / s"${name}.md"
+          val path = docs / "_docs" / "reference" / name / s"${name}.md"
           val contentLines = IO.read(path).linesIterator.to[collection.mutable.ArrayBuffer]
           contentLines.insert(1, s"redirectFrom: /${name}.html") // Add redirection
           val newContent = contentLines.mkString("\n")
@@ -2609,12 +2712,12 @@ object Build {
         val languageReferenceConfig = Def.task {
           Scala3.value
             .add(OutputDir("scaladoc/output/reference"))
-            .add(SiteRoot(s"${temp.getAbsolutePath}/docs"))
+            .add(SiteRoot(docs.getAbsolutePath))
             .add(ProjectName("Scala 3 Reference"))
             .add(ProjectVersion(baseVersion))
             .remove[VersionsDictionaryUrl]
             .add(SourceLinks(List(
-              s"${temp.getAbsolutePath}=github://scala/scala3/language-reference-stable"
+              s"${docs.getParentFile().getAbsolutePath}=github://scala/scala3/language-reference-stable"
             )))
             .withTargets(List("___fake___.scala"))
         }
@@ -3292,6 +3395,7 @@ object ScaladocConfigs {
       .add(DocumentSyntheticTypes(true))
       .add(SnippetCompiler(List(
         s"$dottyLibRoot/src/scala=compile",
+        s"$dottyLibRoot/src/scala/quoted=compile",
         s"$dottyLibRoot/src/scala/compiletime=compile",
         s"$dottyLibRoot/src/scala/util=compile",
         s"$dottyLibRoot/src/scala/util/control=compile"
@@ -3301,35 +3405,4 @@ object ScaladocConfigs {
       .withTargets(roots)
   }
 
-  def stableScala3(version: String) = Def.task {
-    val scalaLibrarySrc = s"out/bootstrap/scala2-library-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/src_managed"
-    val dottyLibrarySrc = "library/src"
-    Scala3.value
-      .add(defaultSourceLinks(version + "-bin-SNAPSHOT-nonbootstrapped", version).value)
-      .add(ProjectVersion(version))
-      .add(SnippetCompiler(
-        List(
-          s"$dottyLibrarySrc/scala/quoted=compile",
-          s"$dottyLibrarySrc/scala/compiletime=compile",
-          s"$dottyLibrarySrc/scala/util=compile",
-          s"$dottyLibrarySrc/scala/util/control=compile"
-        )
-      ))
-      .add(CommentSyntax(List(
-        s"$dottyLibrarySrc=markdown",
-        s"$scalaLibrarySrc=wiki",
-        "wiki"
-      )))
-      .add(DocRootContent(s"$scalaLibrarySrc/rootdoc.txt"))
-      .withTargets(
-        Seq(
-          s"out/bootstrap/scala2-library-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes",
-          s"out/bootstrap/scala3-library-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes",
-          s"tmp/interfaces/target/classes",
-          s"out/bootstrap/tasty-core-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes"
-        )
-      )
-      .remove[SiteRoot]
-      .remove[ApiSubdirectory]
-  }
 }
diff --git a/project/build.sbt b/project/build.sbt
index 188dfa5c6702..9e96a2327deb 100644
--- a/project/build.sbt
+++ b/project/build.sbt
@@ -2,3 +2,6 @@
 libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.0.201803080745-r"
 
 libraryDependencies += Dependencies.`jackson-databind`
+
+// Used for manipulating YAML files in sidebar generation script
+libraryDependencies += "org.yaml" % "snakeyaml" % "2.4"
\ No newline at end of file
diff --git a/project/resources/referenceReplacements/_layouts/static-site-main.html b/project/resources/referenceReplacements/_layouts/static-site-main.html
deleted file mode 100644
index d50b86a0ba03..000000000000
--- a/project/resources/referenceReplacements/_layouts/static-site-main.html
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: main
----
-
-<div class="site-container">
-  <div id="site-header"></div>
-  {{ content }}
-  <div class="divider" />
-  <nav class="arrow-navigation" aria-label="Page navigation">
-    {% if page.previous %}
-    <div>
-      <span class="body-small">Previous</span>
-      <a rel="prev" href="{{ page.previous.url }}" aria-keyshortcuts="Left" class="body-medium">
-        <span class="body-medium">{{ page.previous.title }}</span>
-      </a>
-    </div>
-    {% endif %} {% if page.next %}
-    <div>
-      <span class="body-small">Next</span>
-      <a rel="next" href="{{ page.next.url }}" aria-keyshortcuts="Right" class="body-medium">
-        <span class="body-medium">{{ page.next.title }}</span>
-      </a>
-    </div>
-    {% endif %}
-  </nav>
-</div>
diff --git a/project/resources/referenceReplacements/sidebar.yml b/project/resources/referenceReplacements/sidebar.yml
deleted file mode 100644
index 4e40642858c9..000000000000
--- a/project/resources/referenceReplacements/sidebar.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-index: reference/overview.md
-subsection:
-  - title: New Types
-    index: reference/new-types/new-types.md
-    subsection:
-      - page: reference/new-types/intersection-types.md
-      - page: reference/new-types/intersection-types-spec.md
-        hidden: true
-      - page: reference/new-types/union-types.md
-      - page: reference/new-types/union-types-spec.md
-        hidden: true
-      - page: reference/new-types/type-lambdas.md
-      - page: reference/new-types/type-lambdas-spec.md
-        hidden: true
-      - page: reference/new-types/match-types.md
-      - page: reference/new-types/dependent-function-types.md
-      - page: reference/new-types/dependent-function-types-spec.md
-        hidden: true
-      - page: reference/new-types/polymorphic-function-types.md
-  - title: Enums
-    index: reference/enums/enums-index.md
-    subsection:
-      - page: reference/enums/enums.md
-      - page: reference/enums/adts.md
-      - page: reference/enums/desugarEnums.md
-  - title: Contextual Abstractions
-    index: reference/contextual/contextual.md
-    directory: contextual
-    subsection:
-      - page: reference/contextual/givens.md
-      - page: reference/contextual/deferred-givens.md
-      - page: reference/contextual/more-givens.md
-      - page: reference/contextual/previous-givens.md
-      - page: reference/contextual/using-clauses.md
-      - page: reference/contextual/context-bounds.md
-      - page: reference/contextual/given-imports.md
-      - page: reference/contextual/extension-methods.md
-      - page: reference/contextual/right-associative-extension-methods.md
-      - page: reference/contextual/type-classes.md
-      - page: reference/contextual/derivation.md
-      - page: reference/contextual/derivation-macro.md
-      - page: reference/contextual/multiversal-equality.md
-      - page: reference/contextual/context-functions.md
-      - page: reference/contextual/context-functions-spec.md
-        hidden: true
-      - page: reference/contextual/conversions.md
-      - page: reference/contextual/by-name-context-parameters.md
-      - page: reference/contextual/relationship-implicits.md
-  - title: Metaprogramming
-    index: reference/metaprogramming/metaprogramming.md
-    subsection:
-      - page: reference/metaprogramming/inline.md
-      - page: reference/metaprogramming/compiletime-ops.md
-      - page: reference/metaprogramming/macros.md
-      - page: reference/metaprogramming/macros-spec.md
-        hidden: true
-      - page: reference/metaprogramming/staging.md
-      - page: reference/metaprogramming/reflection.md
-      - page: reference/metaprogramming/tasty-inspect.md
-      - page: reference/metaprogramming/simple-smp.md
-  - title: Other New Features
-    index: reference/other-new-features/other-new-features.md
-    subsection:
-      - page: reference/other-new-features/trait-parameters.md
-      - page: reference/other-new-features/transparent-traits.md
-      - page: reference/other-new-features/creator-applications.md
-      - page: reference/other-new-features/export.md
-      - page: reference/other-new-features/opaques.md
-      - page: reference/other-new-features/opaques-details.md
-      - page: reference/other-new-features/open-classes.md
-      - page: reference/other-new-features/parameter-untupling.md
-      - page: reference/other-new-features/parameter-untupling-spec.md
-        hidden: true
-      - page: reference/other-new-features/kind-polymorphism.md
-      - page: reference/other-new-features/matchable.md
-      - page: reference/other-new-features/threadUnsafe-annotation.md
-      - page: reference/other-new-features/targetName.md
-      - page: reference/other-new-features/control-syntax.md
-      - page: reference/other-new-features/indentation.md
-      - page: reference/other-new-features/safe-initialization.md
-      - page: reference/other-new-features/type-test.md
-      - page: reference/other-new-features/experimental-defs.md
-      - page: reference/other-new-features/binary-literals.md
-  - title: Other Changed Features
-    directory: changed-features
-    index: reference/changed-features/changed-features.md
-    subsection:
-      - page: reference/changed-features/numeric-literals.md
-      - page: reference/changed-features/structural-types.md
-      - page: reference/changed-features/structural-types-spec.md
-        hidden: true
-      - page: reference/changed-features/operators.md
-      - page: reference/changed-features/wildcards.md
-      - page: reference/changed-features/imports.md
-      - page: reference/changed-features/type-inference.md
-      - page: reference/changed-features/implicit-resolution.md
-      - page: reference/changed-features/implicit-conversions.md
-      - page: reference/changed-features/implicit-conversions-spec.md
-        hidden: true
-      - page: reference/changed-features/overload-resolution.md
-      - page: reference/changed-features/match-syntax.md
-      - page: reference/changed-features/vararg-splices.md
-      - page: reference/changed-features/pattern-bindings.md
-      - page: reference/changed-features/pattern-matching.md
-      - page: reference/changed-features/eta-expansion.md
-      - page: reference/changed-features/eta-expansion-spec.md
-        hidden: true
-      - page: reference/changed-features/compiler-plugins.md
-      - page: reference/changed-features/lazy-vals-init.md
-      - page: reference/changed-features/main-functions.md
-      - page: reference/changed-features/interpolation-escapes.md
-  - title: Dropped Features
-    index: reference/dropped-features/dropped-features.md
-    subsection:
-      - page: reference/dropped-features/delayed-init.md
-      - page: reference/dropped-features/macros.md
-      - page: reference/dropped-features/existential-types.md
-      - page: reference/dropped-features/type-projection.md
-      - page: reference/dropped-features/do-while.md
-      - page: reference/dropped-features/procedure-syntax.md
-      - page: reference/dropped-features/package-objects.md
-      - page: reference/dropped-features/early-initializers.md
-      - page: reference/dropped-features/class-shadowing.md
-      - page: reference/dropped-features/class-shadowing-spec.md
-        hidden: true
-      - page: reference/dropped-features/limit22.md
-      - page: reference/dropped-features/xml.md
-      - page: reference/dropped-features/symlits.md
-      - page: reference/dropped-features/auto-apply.md
-      - page: reference/dropped-features/weak-conformance.md
-      - page: reference/dropped-features/weak-conformance-spec.md
-        hidden: true
-      - page: reference/dropped-features/nonlocal-returns.md
-      - page: reference/dropped-features/this-qualifier.md
-      - page: reference/dropped-features/wildcard-init.md
-  - title: Experimental Features
-    directory: experimental
-    index: reference/experimental/overview.md
-    subsection:
-      - page: reference/experimental/fewer-braces.md
-        hidden: true
-      - page: reference/experimental/canthrow.md
-      - page: reference/experimental/erased-defs.md
-      - page: reference/experimental/erased-defs-spec.md
-        hidden: true
-      - page: reference/experimental/named-typeargs.md
-      - page: reference/experimental/named-typeargs-spec.md
-        hidden: true
-      - page: reference/experimental/numeric-literals.md
-      - page: reference/experimental/explicit-nulls.md
-      - page: reference/experimental/main-annotation.md
-      - page: reference/experimental/cc.md
-      - page: reference/experimental/cc-advanced.md
-        hidden: true
-      - page: reference/experimental/tupled-function.md
-  - page: reference/syntax.md
-  - title: Language Versions
-    index: reference/language-versions/language-versions.md
-    subsection:
-      - page: reference/language-versions/source-compatibility.md
-      - page: reference/language-versions/binary-compatibility.md
-  - page: reference/soft-modifier.md
-  - page: reference/features-classification.md
diff --git a/project/scripts/expected-links/reference-expected-links.txt b/project/scripts/expected-links/reference-expected-links.txt
index 3eb5df97bf14..418db4f1f027 100644
--- a/project/scripts/expected-links/reference-expected-links.txt
+++ b/project/scripts/expected-links/reference-expected-links.txt
@@ -41,6 +41,8 @@
 ./contextual/right-associative-extension-methods.html
 ./contextual/type-classes.html
 ./contextual/using-clauses.html
+./docs/reference/experimental/package-object-values.html
+./docs/reference/other-new-features/into.html
 ./docs/reference/other-new-features/named-typeargs.html
 ./dropped-features.html
 ./dropped-features/auto-apply.html
@@ -54,7 +56,6 @@
 ./dropped-features/limit22.html
 ./dropped-features/macros.html
 ./dropped-features/nonlocal-returns.html
-./dropped-features/package-objects.html
 ./dropped-features/procedure-syntax.html
 ./dropped-features/symlits.html
 ./dropped-features/this-qualifier.html
@@ -75,12 +76,19 @@
 ./experimental/explicit-nulls.html
 ./experimental/fewer-braces.html
 ./experimental/index.html
+./experimental/into.html
 ./experimental/main-annotation.html
+./experimental/modularity.html
 ./experimental/named-typeargs-spec.html
 ./experimental/named-typeargs.html
 ./experimental/numeric-literals.html
 ./experimental/overview.html
+./experimental/package-object-values.html
+./experimental/purefuns.html
+./experimental/runtimeChecked.html
 ./experimental/tupled-function.html
+./experimental/typeclasses.html
+./experimental/unrolled-defs.html
 ./features-classification.html
 ./index.html
 ./language-versions/binary-compatibility.html
@@ -117,17 +125,23 @@
 ./other-new-features/index.html
 ./other-new-features/kind-polymorphism.html
 ./other-new-features/matchable.html
+./other-new-features/named-tuples.html
 ./other-new-features/opaques-details.html
 ./other-new-features/opaques.html
 ./other-new-features/open-classes.html
 ./other-new-features/parameter-untupling-spec.html
 ./other-new-features/parameter-untupling.html
+./other-new-features/preview-defs.html
 ./other-new-features/safe-initialization.html
 ./other-new-features/targetName.html
 ./other-new-features/threadUnsafe-annotation.html
+./other-new-features/toplevel-definitions.html
 ./other-new-features/trait-parameters.html
 ./other-new-features/transparent-traits.html
 ./other-new-features/type-test.html
 ./overview.html
+./preview/better-fors.html
+./preview/index.html
+./preview/overview.html
 ./soft-modifier.html
 ./syntax.html