diff --git a/.gitmodules b/.gitmodules
index c27ee75a76e2..8f87e992013a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,10 +28,6 @@
 [submodule "community-build/community-projects/scala-xml"]
 	path = community-build/community-projects/scala-xml
 	url = https://github.com/dotty-staging/scala-xml
-[submodule "community-build/community-projects/shapeless"]
-	path = community-build/community-projects/shapeless
-	url = https://github.com/dotty-staging/shapeless
-	branch = shapeless-3-staging
 [submodule "community-build/community-projects/xml-interpolator"]
 	path = community-build/community-projects/xml-interpolator
 	url = https://github.com/dotty-staging/xml-interpolator.git
@@ -222,3 +218,6 @@
 [submodule "community-build/community-projects/parboiled2"]
 	path = community-build/community-projects/parboiled2
 	url = https://github.com/dotty-staging/parboiled2.git
+[submodule "community-build/community-projects/shapeless-3"]
+	path = community-build/community-projects/shapeless-3
+	url = https://github.com/dotty-staging/shapeless-3.git
diff --git a/community-build/community-projects/shapeless b/community-build/community-projects/shapeless
deleted file mode 160000
index 04e8cebc6097..000000000000
--- a/community-build/community-projects/shapeless
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 04e8cebc6097357598b15caf428e86b78dde0888
diff --git a/community-build/community-projects/shapeless-3 b/community-build/community-projects/shapeless-3
new file mode 160000
index 000000000000..d27c5ba1ae51
--- /dev/null
+++ b/community-build/community-projects/shapeless-3
@@ -0,0 +1 @@
+Subproject commit d27c5ba1ae5111b85df2cfb65a26b9246c52570c
diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala
index 5a9347aa87c2..527b4f85c961 100644
--- a/community-build/src/scala/dotty/communitybuild/projects.scala
+++ b/community-build/src/scala/dotty/communitybuild/projects.scala
@@ -366,12 +366,10 @@ object projects:
     // sbtDocCommand = "library/doc" // Does no compile? No idea :/
   )
 
-
-  lazy val shapeless = SbtCommunityProject(
-    project       = "shapeless",
-    sbtTestCommand = """set deriving/scalacOptions -= "-Xfatal-warnings"; set typeable/scalacOptions -= "-Xfatal-warnings"; test""",
-      // selectively disable -Xfatal-warnings due to deprecations
-    sbtDocCommand = forceDoc("typeable", "deriving", "data"),
+  lazy val shapeless3 = SbtCommunityProject(
+    project = "shapeless-3",
+    sbtTestCommand = "testJVM; testJS",
+    sbtDocCommand = forceDoc("typeable", "deriving"),
     scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), // due to -Xfatal-warnings
   )
 
@@ -796,7 +794,7 @@ def allProjects = List(
   projects.minitest,
   projects.fastparse,
   projects.stdLib213,
-  projects.shapeless,
+  projects.shapeless3,
   projects.xmlInterpolator,
   projects.effpi,
   projects.sconfig,
diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
index bf6b6d431509..6a4f832ce05a 100644
--- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
+++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
@@ -91,7 +91,7 @@ class CommunityBuildTestC:
   @Test def scalaz = projects.scalaz.run()
   @Test def scas = projects.scas.run()
   @Test def sconfig = projects.sconfig.run()
-  @Test def shapeless = projects.shapeless.run()
+  @Test def shapeless3 = projects.shapeless3.run()
   @Test def sourcecode = projects.sourcecode.run()
   @Test def specs2 = projects.specs2.run()