From 45e13d75add2eb886978696d94c1de5251e9c8b0 Mon Sep 17 00:00:00 2001
From: Eric Loots <eric.loots@gmail.com>
Date: Mon, 18 Sep 2023 17:38:13 +0200
Subject: [PATCH 1/2] Fix typos

---
 .../extensionmethods/ExtensionOperators.worksheet.sc      | 8 --------
 slides/01-introduction.md                                 | 2 +-
 slides/index.html                                         | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/extensionmethods/ExtensionOperators.worksheet.sc

diff --git a/code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/extensionmethods/ExtensionOperators.worksheet.sc b/code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/extensionmethods/ExtensionOperators.worksheet.sc
deleted file mode 100644
index 375c8614f..000000000
--- a/code-snippets/contextual-abstractions/src/main/scala/org/lunatech/dotty/extensionmethods/ExtensionOperators.worksheet.sc
+++ /dev/null
@@ -1,8 +0,0 @@
-// Metals Scala worksheet
-
-extension (a: String) def < (b: String): Boolean = a.compareTo(b) < 0
-  
-extension (a: Int) def  +++: (b: List[Int]) = a::b
-
-println("abc" < "pqr")
-println(1 +++: List(2,3,4))
diff --git a/slides/01-introduction.md b/slides/01-introduction.md
index 40df47253..0df89b566 100644
--- a/slides/01-introduction.md
+++ b/slides/01-introduction.md
@@ -100,7 +100,7 @@
 ## &#173;
 
 * _Eric Loots_ (Lunatech Belgium)
-* _Adrien Picquerez_ (EPFL Scala Center Switzerland)
+* _Adrien Piquerez_ (EPFL Scala Center Switzerland)
 * _Trevor Burton-McCreadie_ (Lunatech United Kingdom)
 
 ---
diff --git a/slides/index.html b/slides/index.html
index c875d6a38..b5e43d8b8 100644
--- a/slides/index.html
+++ b/slides/index.html
@@ -13,7 +13,7 @@
     <!-- Title-Footer initialisation -->
     <link rel="stylesheet" href="plugin/title-footer/title-footer.css">
     <!-- Theme used for syntax highlighted code -->
-    <link rel="stylesheet" href="plugin/highlight/lunatech.css">
+    <link rel="stylesheet" href="plugin/highlight/zenburn.css">
 
     <!-- Prevent reveal to change any header to all-caps -->
     <style>

From 2b2666d89ee4b9f13ca0a65aa094ceba33cd28e3 Mon Sep 17 00:00:00 2001
From: Eric Loots <eric.loots@gmail.com>
Date: Mon, 18 Sep 2023 18:22:42 +0200
Subject: [PATCH 2/2] Switch to Pekko 1.0.1

- Update dependencies from Akka to Pekko
- Adjust imports
- Adjust application configuration to Pekko
---
 .../project/Build.scala                                | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 .../build.sbt                                          |  2 +-
 .../project/Build.scala                                | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 .../build.sbt                                          |  2 +-
 .../project/Build.scala                                | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 exercises/exercise_003_top_level_definitions/build.sbt |  2 +-
 .../project/Build.scala                                | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 exercises/exercise_004_parameter_untupling/build.sbt   |  2 +-
 .../project/Build.scala                                | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 exercises/exercise_005_extension_methods/build.sbt     |  2 +-
 .../exercise_005_extension_methods/project/Build.scala | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 exercises/exercise_006_using_and_summon/build.sbt      |  2 +-
 .../exercise_006_using_and_summon/project/Build.scala  | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 exercises/exercise_007_givens/build.sbt                |  2 +-
 exercises/exercise_007_givens/project/Build.scala      | 10 +++++-----
 exercises/exercise_007_givens/project/build.properties |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 exercises/exercise_008_enum_and_export/build.sbt       |  2 +-
 .../exercise_008_enum_and_export/project/Build.scala   | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 exercises/exercise_009_union_types/build.sbt           |  2 +-
 exercises/exercise_009_union_types/project/Build.scala | 10 +++++-----
 .../exercise_009_union_types/project/build.properties  |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 .../build.sbt                                          |  2 +-
 .../project/Build.scala                                | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 .../build.sbt                                          |  2 +-
 .../project/Build.scala                                | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 exercises/exercise_012_multiversal_equality/build.sbt  |  2 +-
 .../project/Build.scala                                | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 .../exercise_020_opaque_type_aliases_alt/build.sbt     |  2 +-
 .../project/Build.scala                                | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 exercises/exercise_021_multiversal_equality/build.sbt  |  2 +-
 .../project/Build.scala                                | 10 +++++-----
 .../project/build.properties                           |  2 +-
 .../src/main/resources/application.conf                |  2 +-
 .../org/lunatechlabs/dotty/SudokuSolverMain.scala      |  8 ++++----
 .../dotty/sudoku/SudokuDetailProcessor.scala           |  4 ++--
 .../dotty/sudoku/SudokuProblemSender.scala             |  4 ++--
 .../dotty/sudoku/SudokuProgressTracker.scala           |  4 ++--
 .../org/lunatechlabs/dotty/sudoku/SudokuSolver.scala   |  6 +++---
 .../dotty/sudoku/SudokuDetailProcessorSuite.scala      |  2 +-
 149 files changed, 329 insertions(+), 329 deletions(-)

diff --git a/exercises/exercise_000_sudoku_solver_initial_state/project/Build.scala b/exercises/exercise_000_sudoku_solver_initial_state/project/Build.scala
index ee2789094..216a9fba2 100644
--- a/exercises/exercise_000_sudoku_solver_initial_state/project/Build.scala
+++ b/exercises/exercise_000_sudoku_solver_initial_state/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_000_sudoku_solver_initial_state/project/build.properties b/exercises/exercise_000_sudoku_solver_initial_state/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_000_sudoku_solver_initial_state/project/build.properties
+++ b/exercises/exercise_000_sudoku_solver_initial_state/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_000_sudoku_solver_initial_state/src/main/resources/application.conf b/exercises/exercise_000_sudoku_solver_initial_state/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_000_sudoku_solver_initial_state/src/main/resources/application.conf
+++ b/exercises/exercise_000_sudoku_solver_initial_state/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 67dc0f85e..834a62b87 100644
--- a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 2cdb58550..6e4edab1f 100644
--- a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor {
 
diff --git a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index 5b18ab507..9916b22fe 100644
--- a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender {
 
diff --git a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index ddddebc51..3b0681de3 100644
--- a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker {
 
diff --git a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index bb4e5f503..eab7bca3b 100644
--- a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration._
 
diff --git a/exercises/exercise_000_sudoku_solver_initial_state/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_000_sudoku_solver_initial_state/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b55818928..380a3c058 100644
--- a/exercises/exercise_000_sudoku_solver_initial_state/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_000_sudoku_solver_initial_state/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file._
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers {
diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/build.sbt b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/build.sbt
+++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/project/Build.scala b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/project/Build.scala
+++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/project/build.properties b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/project/build.properties
+++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/resources/application.conf b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/resources/application.conf
+++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 67dc0f85e..834a62b87 100644
--- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 8e1a1dd93..e1d124bec 100644
--- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor {
 
diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index fd550e14b..79bbbf8e7 100644
--- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender {
 
diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index ee76c0fba..bfa2ed96e 100644
--- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker {
 
diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index c6d156a71..075f1d23f 100644
--- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index c0c4cc6f7..c0dd76c42 100644
--- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers {
diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/build.sbt b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/build.sbt
+++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/project/Build.scala b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/project/Build.scala
+++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/project/build.properties b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/project/build.properties
+++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/resources/application.conf b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/resources/application.conf
+++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 1cebda0ac..03d1fc93e 100644
--- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 793fe4225..1e5c985fb 100644
--- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index 74399b873..72eeb780e 100644
--- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index 21375db19..b4077af90 100644
--- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index 0736810dc..f11c8644a 100644
--- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b1fe3cacc..80885d4a4 100644
--- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_003_top_level_definitions/build.sbt b/exercises/exercise_003_top_level_definitions/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_003_top_level_definitions/build.sbt
+++ b/exercises/exercise_003_top_level_definitions/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_003_top_level_definitions/project/Build.scala b/exercises/exercise_003_top_level_definitions/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_003_top_level_definitions/project/Build.scala
+++ b/exercises/exercise_003_top_level_definitions/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_003_top_level_definitions/project/build.properties b/exercises/exercise_003_top_level_definitions/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_003_top_level_definitions/project/build.properties
+++ b/exercises/exercise_003_top_level_definitions/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_003_top_level_definitions/src/main/resources/application.conf b/exercises/exercise_003_top_level_definitions/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_003_top_level_definitions/src/main/resources/application.conf
+++ b/exercises/exercise_003_top_level_definitions/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 793fe4225..1e5c985fb 100644
--- a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index 74399b873..72eeb780e 100644
--- a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index 21375db19..b4077af90 100644
--- a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index 0736810dc..f11c8644a 100644
--- a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_003_top_level_definitions/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_003_top_level_definitions/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b1fe3cacc..80885d4a4 100644
--- a/exercises/exercise_003_top_level_definitions/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_003_top_level_definitions/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_004_parameter_untupling/build.sbt b/exercises/exercise_004_parameter_untupling/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_004_parameter_untupling/build.sbt
+++ b/exercises/exercise_004_parameter_untupling/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_004_parameter_untupling/project/Build.scala b/exercises/exercise_004_parameter_untupling/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_004_parameter_untupling/project/Build.scala
+++ b/exercises/exercise_004_parameter_untupling/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_004_parameter_untupling/project/build.properties b/exercises/exercise_004_parameter_untupling/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_004_parameter_untupling/project/build.properties
+++ b/exercises/exercise_004_parameter_untupling/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_004_parameter_untupling/src/main/resources/application.conf b/exercises/exercise_004_parameter_untupling/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_004_parameter_untupling/src/main/resources/application.conf
+++ b/exercises/exercise_004_parameter_untupling/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 793fe4225..1e5c985fb 100644
--- a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index 8cdbd1e0a..85f24ba72 100644
--- a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index ab0ba9638..3e2fb4d15 100644
--- a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index ca1865c12..e6eb35cea 100644
--- a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_004_parameter_untupling/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_004_parameter_untupling/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b1fe3cacc..80885d4a4 100644
--- a/exercises/exercise_004_parameter_untupling/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_004_parameter_untupling/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_005_extension_methods/build.sbt b/exercises/exercise_005_extension_methods/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_005_extension_methods/build.sbt
+++ b/exercises/exercise_005_extension_methods/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_005_extension_methods/project/Build.scala b/exercises/exercise_005_extension_methods/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_005_extension_methods/project/Build.scala
+++ b/exercises/exercise_005_extension_methods/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_005_extension_methods/project/build.properties b/exercises/exercise_005_extension_methods/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_005_extension_methods/project/build.properties
+++ b/exercises/exercise_005_extension_methods/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_005_extension_methods/src/main/resources/application.conf b/exercises/exercise_005_extension_methods/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_005_extension_methods/src/main/resources/application.conf
+++ b/exercises/exercise_005_extension_methods/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 62041be80..d0f3922eb 100644
--- a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index 8cdbd1e0a..85f24ba72 100644
--- a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index ab0ba9638..3e2fb4d15 100644
--- a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index ca1865c12..e6eb35cea 100644
--- a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_005_extension_methods/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_005_extension_methods/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b1fe3cacc..80885d4a4 100644
--- a/exercises/exercise_005_extension_methods/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_005_extension_methods/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_006_using_and_summon/build.sbt b/exercises/exercise_006_using_and_summon/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_006_using_and_summon/build.sbt
+++ b/exercises/exercise_006_using_and_summon/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_006_using_and_summon/project/Build.scala b/exercises/exercise_006_using_and_summon/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_006_using_and_summon/project/Build.scala
+++ b/exercises/exercise_006_using_and_summon/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_006_using_and_summon/project/build.properties b/exercises/exercise_006_using_and_summon/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_006_using_and_summon/project/build.properties
+++ b/exercises/exercise_006_using_and_summon/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_006_using_and_summon/src/main/resources/application.conf b/exercises/exercise_006_using_and_summon/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_006_using_and_summon/src/main/resources/application.conf
+++ b/exercises/exercise_006_using_and_summon/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 4deffe259..ab4611eb7 100644
--- a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index 8cdbd1e0a..85f24ba72 100644
--- a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index ab0ba9638..3e2fb4d15 100644
--- a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index eb043688f..588a3ffd2 100644
--- a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_006_using_and_summon/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_006_using_and_summon/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b1fe3cacc..80885d4a4 100644
--- a/exercises/exercise_006_using_and_summon/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_006_using_and_summon/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_007_givens/build.sbt b/exercises/exercise_007_givens/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_007_givens/build.sbt
+++ b/exercises/exercise_007_givens/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_007_givens/project/Build.scala b/exercises/exercise_007_givens/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_007_givens/project/Build.scala
+++ b/exercises/exercise_007_givens/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_007_givens/project/build.properties b/exercises/exercise_007_givens/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_007_givens/project/build.properties
+++ b/exercises/exercise_007_givens/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_007_givens/src/main/resources/application.conf b/exercises/exercise_007_givens/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_007_givens/src/main/resources/application.conf
+++ b/exercises/exercise_007_givens/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 6c291689c..06a932fe3 100644
--- a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index 8cdbd1e0a..85f24ba72 100644
--- a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index ab0ba9638..3e2fb4d15 100644
--- a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index eb043688f..588a3ffd2 100644
--- a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_007_givens/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_007_givens/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b1fe3cacc..80885d4a4 100644
--- a/exercises/exercise_007_givens/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_007_givens/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_008_enum_and_export/build.sbt b/exercises/exercise_008_enum_and_export/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_008_enum_and_export/build.sbt
+++ b/exercises/exercise_008_enum_and_export/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_008_enum_and_export/project/Build.scala b/exercises/exercise_008_enum_and_export/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_008_enum_and_export/project/Build.scala
+++ b/exercises/exercise_008_enum_and_export/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_008_enum_and_export/project/build.properties b/exercises/exercise_008_enum_and_export/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_008_enum_and_export/project/build.properties
+++ b/exercises/exercise_008_enum_and_export/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_008_enum_and_export/src/main/resources/application.conf b/exercises/exercise_008_enum_and_export/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_008_enum_and_export/src/main/resources/application.conf
+++ b/exercises/exercise_008_enum_and_export/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 7a46b7b37..ef688b656 100644
--- a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index f935ea683..de817f1ff 100644
--- a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index 2b31db898..9de2cd836 100644
--- a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index a477411a7..579e7014f 100644
--- a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_008_enum_and_export/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_008_enum_and_export/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b1fe3cacc..80885d4a4 100644
--- a/exercises/exercise_008_enum_and_export/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_008_enum_and_export/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_009_union_types/build.sbt b/exercises/exercise_009_union_types/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_009_union_types/build.sbt
+++ b/exercises/exercise_009_union_types/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_009_union_types/project/Build.scala b/exercises/exercise_009_union_types/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_009_union_types/project/Build.scala
+++ b/exercises/exercise_009_union_types/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_009_union_types/project/build.properties b/exercises/exercise_009_union_types/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_009_union_types/project/build.properties
+++ b/exercises/exercise_009_union_types/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_009_union_types/src/main/resources/application.conf b/exercises/exercise_009_union_types/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_009_union_types/src/main/resources/application.conf
+++ b/exercises/exercise_009_union_types/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 7a46b7b37..ef688b656 100644
--- a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index f08dbf878..90cb5b156 100644
--- a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index 2b31db898..9de2cd836 100644
--- a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index 5e3ef3146..50de0f1f1 100644
--- a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_009_union_types/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_009_union_types/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b1fe3cacc..80885d4a4 100644
--- a/exercises/exercise_009_union_types/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_009_union_types/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_010_exploring_opaque_type_aliases/build.sbt b/exercises/exercise_010_exploring_opaque_type_aliases/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_010_exploring_opaque_type_aliases/build.sbt
+++ b/exercises/exercise_010_exploring_opaque_type_aliases/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_010_exploring_opaque_type_aliases/project/Build.scala b/exercises/exercise_010_exploring_opaque_type_aliases/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_010_exploring_opaque_type_aliases/project/Build.scala
+++ b/exercises/exercise_010_exploring_opaque_type_aliases/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_010_exploring_opaque_type_aliases/project/build.properties b/exercises/exercise_010_exploring_opaque_type_aliases/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_010_exploring_opaque_type_aliases/project/build.properties
+++ b/exercises/exercise_010_exploring_opaque_type_aliases/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/resources/application.conf b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/resources/application.conf
+++ b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 7a46b7b37..ef688b656 100644
--- a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index f08dbf878..90cb5b156 100644
--- a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index 2b31db898..9de2cd836 100644
--- a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index 5e3ef3146..50de0f1f1 100644
--- a/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_010_exploring_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_010_exploring_opaque_type_aliases/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_010_exploring_opaque_type_aliases/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b1fe3cacc..80885d4a4 100644
--- a/exercises/exercise_010_exploring_opaque_type_aliases/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_010_exploring_opaque_type_aliases/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_011_optional_opaque_type_aliases/build.sbt b/exercises/exercise_011_optional_opaque_type_aliases/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_011_optional_opaque_type_aliases/build.sbt
+++ b/exercises/exercise_011_optional_opaque_type_aliases/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_011_optional_opaque_type_aliases/project/Build.scala b/exercises/exercise_011_optional_opaque_type_aliases/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_011_optional_opaque_type_aliases/project/Build.scala
+++ b/exercises/exercise_011_optional_opaque_type_aliases/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_011_optional_opaque_type_aliases/project/build.properties b/exercises/exercise_011_optional_opaque_type_aliases/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_011_optional_opaque_type_aliases/project/build.properties
+++ b/exercises/exercise_011_optional_opaque_type_aliases/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_011_optional_opaque_type_aliases/src/main/resources/application.conf b/exercises/exercise_011_optional_opaque_type_aliases/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_011_optional_opaque_type_aliases/src/main/resources/application.conf
+++ b/exercises/exercise_011_optional_opaque_type_aliases/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 0d5d6889e..f86241f44 100644
--- a/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index f08dbf878..90cb5b156 100644
--- a/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index 2b31db898..9de2cd836 100644
--- a/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index 5e3ef3146..50de0f1f1 100644
--- a/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_011_optional_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_011_optional_opaque_type_aliases/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_011_optional_opaque_type_aliases/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b1fe3cacc..80885d4a4 100644
--- a/exercises/exercise_011_optional_opaque_type_aliases/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_011_optional_opaque_type_aliases/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_012_multiversal_equality/build.sbt b/exercises/exercise_012_multiversal_equality/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_012_multiversal_equality/build.sbt
+++ b/exercises/exercise_012_multiversal_equality/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_012_multiversal_equality/project/Build.scala b/exercises/exercise_012_multiversal_equality/project/Build.scala
index 6cad99625..d0f8ac04a 100644
--- a/exercises/exercise_012_multiversal_equality/project/Build.scala
+++ b/exercises/exercise_012_multiversal_equality/project/Build.scala
@@ -12,7 +12,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -20,11 +20,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_012_multiversal_equality/project/build.properties b/exercises/exercise_012_multiversal_equality/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_012_multiversal_equality/project/build.properties
+++ b/exercises/exercise_012_multiversal_equality/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_012_multiversal_equality/src/main/resources/application.conf b/exercises/exercise_012_multiversal_equality/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_012_multiversal_equality/src/main/resources/application.conf
+++ b/exercises/exercise_012_multiversal_equality/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 969ce822c..1623b4007 100644
--- a/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index 2c11a1519..ec1bcecab 100644
--- a/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index 2b31db898..9de2cd836 100644
--- a/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index ed6649bdd..849f5854a 100644
--- a/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_012_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_012_multiversal_equality/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_012_multiversal_equality/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index b1fe3cacc..80885d4a4 100644
--- a/exercises/exercise_012_multiversal_equality/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_012_multiversal_equality/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_020_opaque_type_aliases_alt/build.sbt b/exercises/exercise_020_opaque_type_aliases_alt/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_020_opaque_type_aliases_alt/build.sbt
+++ b/exercises/exercise_020_opaque_type_aliases_alt/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_020_opaque_type_aliases_alt/project/Build.scala b/exercises/exercise_020_opaque_type_aliases_alt/project/Build.scala
index ee8ff2f88..1df4e02fd 100644
--- a/exercises/exercise_020_opaque_type_aliases_alt/project/Build.scala
+++ b/exercises/exercise_020_opaque_type_aliases_alt/project/Build.scala
@@ -11,7 +11,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -19,11 +19,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_020_opaque_type_aliases_alt/project/build.properties b/exercises/exercise_020_opaque_type_aliases_alt/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_020_opaque_type_aliases_alt/project/build.properties
+++ b/exercises/exercise_020_opaque_type_aliases_alt/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_020_opaque_type_aliases_alt/src/main/resources/application.conf b/exercises/exercise_020_opaque_type_aliases_alt/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_020_opaque_type_aliases_alt/src/main/resources/application.conf
+++ b/exercises/exercise_020_opaque_type_aliases_alt/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index 7a46b7b37..ef688b656 100644
--- a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index f08dbf878..90cb5b156 100644
--- a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index 2b31db898..9de2cd836 100644
--- a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index 499a1e3b6..0ea7dbec1 100644
--- a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_020_opaque_type_aliases_alt/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_020_opaque_type_aliases_alt/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index 891c7fbd9..988af9da4 100644
--- a/exercises/exercise_020_opaque_type_aliases_alt/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_020_opaque_type_aliases_alt/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
diff --git a/exercises/exercise_021_multiversal_equality/build.sbt b/exercises/exercise_021_multiversal_equality/build.sbt
index d104338c1..b9c6c83da 100644
--- a/exercises/exercise_021_multiversal_equality/build.sbt
+++ b/exercises/exercise_021_multiversal_equality/build.sbt
@@ -2,7 +2,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val `moving-from-scala-2-to-scala-3` =
   (project in file(".")).settings(
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     Compile / scalacOptions ++= CompileOptions.compileOptions,
     libraryDependencies ++= Dependencies.dependencies,
     testFrameworks += new TestFramework("munit.Framework"))
diff --git a/exercises/exercise_021_multiversal_equality/project/Build.scala b/exercises/exercise_021_multiversal_equality/project/Build.scala
index 6cad99625..d0f8ac04a 100644
--- a/exercises/exercise_021_multiversal_equality/project/Build.scala
+++ b/exercises/exercise_021_multiversal_equality/project/Build.scala
@@ -12,7 +12,7 @@ object CompileOptions {
 }
 
 object Versions {
-  lazy val akkaVer = "2.6.20"
+  lazy val PekkoVersion = "1.0.1"
   lazy val logbackVer = "1.2.3"
   lazy val mUnitVer = "0.7.26"
 }
@@ -20,11 +20,11 @@ object Versions {
 object Dependencies {
 
   private lazy val akkaDeps = Seq(
-    "com.typesafe.akka" %% "akka-actor-typed",
-    "com.typesafe.akka" %% "akka-slf4j",
-    "com.typesafe.akka" %% "akka-stream").map(_ % Versions.akkaVer)
+    "org.apache.pekko" %% "pekko-actor-typed",
+    "org.apache.pekko" %% "pekko-slf4j",
+    "org.apache.pekko" %% "pekko-stream").map(_ % Versions.PekkoVersion)
 
-  private lazy val akkaTestkitDeps = Seq("com.typesafe.akka" %% "akka-actor-testkit-typed" % Versions.akkaVer % Test)
+  private lazy val akkaTestkitDeps = Seq("org.apache.pekko" %% "pekko-actor-testkit-typed" % Versions.PekkoVersion % Test)
 
   private lazy val logbackDeps = Seq("ch.qos.logback" % "logback-classic").map(_ % Versions.logbackVer)
 
diff --git a/exercises/exercise_021_multiversal_equality/project/build.properties b/exercises/exercise_021_multiversal_equality/project/build.properties
index 304098715..27430827b 100644
--- a/exercises/exercise_021_multiversal_equality/project/build.properties
+++ b/exercises/exercise_021_multiversal_equality/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6
diff --git a/exercises/exercise_021_multiversal_equality/src/main/resources/application.conf b/exercises/exercise_021_multiversal_equality/src/main/resources/application.conf
index 0b5d34e99..81759392b 100644
--- a/exercises/exercise_021_multiversal_equality/src/main/resources/application.conf
+++ b/exercises/exercise_021_multiversal_equality/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+org.apache.pekko {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
diff --git a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
index 5babffb1e..4589b67b3 100644
--- a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
+++ b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala
@@ -15,10 +15,10 @@
 
 package org.lunatechlabs.dotty
 
-import akka.NotUsed
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.actor.typed.scaladsl.{Behaviors, Routers}
-import akka.actor.typed.{ActorSystem, Behavior, Terminated}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import org.apache.pekko.actor.typed.scaladsl.{Behaviors, Routers}
+import org.apache.pekko.actor.typed.{ActorSystem, Behavior, Terminated}
 import org.lunatechlabs.dotty.sudoku.{SudokuProblemSender, SudokuSolver, SudokuSolverSettings}
 import scala.io.StdIn
 import scala.Console.{GREEN, RESET}
diff --git a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
index dd309c7b6..52edd06b8 100644
--- a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
+++ b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessor.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuDetailProcessor:
 
diff --git a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
index bbafda6cf..e17c8ab71 100644
--- a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
+++ b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProblemSender.scala
@@ -2,8 +2,8 @@ package org.lunatechlabs.dotty.sudoku
 
 import java.io.File
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, TimerScheduler}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProblemSender:
 
diff --git a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
index 2b31db898..9de2cd836 100644
--- a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
+++ b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors}
-import akka.actor.typed.{ActorRef, Behavior}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior}
 
 object SudokuProgressTracker:
 
diff --git a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
index 02098d748..c6d13c355 100644
--- a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
+++ b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala
@@ -1,8 +1,8 @@
 package org.lunatechlabs.dotty.sudoku
 
-import akka.actor.typed.receptionist.{Receptionist, ServiceKey}
-import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
-import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
+import org.apache.pekko.actor.typed.receptionist.{Receptionist, ServiceKey}
+import org.apache.pekko.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer}
+import org.apache.pekko.actor.typed.{ActorRef, Behavior, SupervisorStrategy}
 
 import scala.concurrent.duration.*
 
diff --git a/exercises/exercise_021_multiversal_equality/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala b/exercises/exercise_021_multiversal_equality/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
index 891c7fbd9..988af9da4 100644
--- a/exercises/exercise_021_multiversal_equality/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
+++ b/exercises/exercise_021_multiversal_equality/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala
@@ -1,7 +1,7 @@
 package org.lunatechlabs.dotty.sudoku
 
 import SudokuDetailProcessor.{Update, SudokuDetailUnchanged, BlockUpdate}
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
 import java.nio.file.*
 
 class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers: