diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4a80d7c..e61b5630 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,19 +14,19 @@ variables:
   SBT_OPTS: "-sbt-launch-dir .sbt/launchers -sbt-dir .sbt -ivy .ivy2 -Dsbt.color=true -Dscala.color=true"
   SERVICE: treehub
 
-image: registry.gitlab.com/torizon-platform/ci-container-build:scala-jvm17-0.0.5
+image: registry.gitlab.com/toradex/torizon-cloud/ci-container-build/scala:4acf34bc
 
 include:
-  - project: torizon-platform/ci-container-build
+  - project: toradex/torizon-cloud/ci-container-build
     file: gitlab-ci-templates/gitlab-sbt-docker-publish.yaml
     ref: master
-  - project: 'torizon-platform/deploy-env'
+  - project: 'toradex/torizon-cloud/deploy-env'
     ref: master
     file: '/gitlab/deploy-core-service.yml'
 
 services:
-  - name: docker:dind
-  - name: mariadb:10.4
+  - name: docker:28.5.0-dind
+  - name: mariadb:10.11
     alias: db
     command:
       - --character-set-server=utf8
@@ -54,6 +54,8 @@ test:
     - mysql -v -h db -u root -proot < db_user.sql
   script:
     - sbt ut:test
+  tags:
+    - torizon-cloud-team
 
 build docker image:
   stage: build image
@@ -63,3 +65,5 @@ build docker image:
   extends: .sbt-docker-publish
   variables:
     SERVICE_NAME: treehub
+  tags:
+    - torizon-cloud-team
diff --git a/build.sbt b/build.sbt
index e6381f01..39a54900 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
 name := "treehub"
 organization := "io.github.uptane"
-scalaVersion := "2.13.11"
+scalaVersion := "2.13.16"
 
 scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8", "-Xasync", "-Xsource:3")
 
@@ -21,18 +21,18 @@ lazy val treehub = (project in file("."))
   .settings(UnitTest / testOptions := Seq(Tests.Filter(unitFilter)))
   .settings(IntegrationTest / testOptions := Seq(Tests.Filter(itFilter)))
   .settings(Seq(libraryDependencies ++= {
-    val akkaV = "2.6.20"
-    val akkaHttpV = "10.2.10"
+    val pekkoV = "1.1.5"
+    val pekkoHttpV = "1.2.0"
     val scalaTestV = "3.0.9"
-    val libatsV = "2.1.2"
+    val libatsV = "5.0.0"
 
     Seq(
-      "com.typesafe.akka" %% "akka-actor" % akkaV,
-      "com.typesafe.akka" %% "akka-stream" % akkaV,
-      "com.typesafe.akka" %% "akka-stream-testkit" % akkaV % "test",
-      "com.typesafe.akka" %% "akka-http" % akkaHttpV,
-      "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpV % "test",
-      "com.typesafe.akka" %% "akka-slf4j" % akkaV,
+      "org.apache.pekko" %% "pekko-actor" % pekkoV,
+      "org.apache.pekko" %% "pekko-stream" % pekkoV,
+      "org.apache.pekko" %% "pekko-stream-testkit" % pekkoV % "test",
+      "org.apache.pekko" %% "pekko-http" % pekkoHttpV,
+      "org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpV % "test",
+      "org.apache.pekko" %% "pekko-slf4j" % pekkoV,
       "org.scalatest"     %% "scalatest" % scalaTestV % "test,it",
 
       "ch.qos.logback" % "logback-classic" % "1.5.6",
@@ -44,7 +44,7 @@ lazy val treehub = (project in file("."))
       "io.github.uptane" %% "libats-messaging" % libatsV,
       "io.github.uptane" %% "libats-messaging-datatype" % libatsV,
       "io.github.uptane" %% "libats-slick" % libatsV,
-      "io.github.uptane" %% "libats-metrics-akka" % libatsV,
+      "io.github.uptane" %% "libats-metrics-pekko" % libatsV,
       "io.github.uptane" %% "libats-metrics-prometheus" % libatsV,
       "io.github.uptane" %% "libats-logging" % libatsV,
       "io.github.uptane" %% "libats-logging" % libatsV,
diff --git a/deploy/ci-db-setup.sh b/deploy/ci-db-setup.sh
index 6534c802..8850b147 100755
--- a/deploy/ci-db-setup.sh
+++ b/deploy/ci-db-setup.sh
@@ -2,16 +2,16 @@
 
 set -xeuo pipefail
 
-MYSQL_COMMAND=mysql
+MYSQL_COMMAND=mariadb
 HOST=$1
-MYSQL=mysql
-MYSQLADMIN=mysqladmin
+MYSQL=mariadb
+MYSQLADMIN=mariadb-admin
 
-until $MYSQLADMIN ping --silent --protocol=TCP -h $HOST -P 3306 -u root -proot; do
+until $MYSQLADMIN ping --skip-ssl --silent --protocol=TCP -h $HOST -P 3306 -u root -proot; do
     echo waiting for mysql; sleep 1
 done
 
-$MYSQL -v -h $HOST -u root -proot <<EOF
+$MYSQL --skip-ssl -v -h $HOST -u root -proot <<EOF
 CREATE DATABASE IF NOT EXISTS ota_treehub;
 
 CREATE USER IF NOT EXISTS 'treehub' IDENTIFIED BY 'treehub';
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
index 7b70cf29..eade355e 100644
--- a/src/main/resources/application.conf
+++ b/src/main/resources/application.conf
@@ -1,15 +1,15 @@
-akka {
-  loggers = ["akka.event.slf4j.Slf4jLogger"]
+pekko {
+  loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"]
 
   http.server = {
     parsing.max-content-length = 3GB
-    parsing.max-content-length = ${?AKKA_HTTP_MAX_CONTENT_LENGTH}
+    parsing.max-content-length = ${?PEKKO_HTTP_MAX_CONTENT_LENGTH}
     request-timeout = 5 minutes
-    request-timeout = ${?AKKA_HTTP_REQUEST_TIMEOUT}
+    request-timeout = ${?PEKKO_HTTP_REQUEST_TIMEOUT}
     idle-timeout = 5 minutes
-    idle-timeout = ${?AKKA_HTTP_IDLE_TIMEOUT}
+    idle-timeout = ${?PEKKO_HTTP_IDLE_TIMEOUT}
     max-connections = 1024
-    max-connections = ${?AKKA_HTTP_MAX_CONNECTIONS}
+    max-connections = ${?PEKKO_HTTP_MAX_CONNECTIONS}
   }
 
   actor.deployment {
diff --git a/src/main/scala/com/advancedtelematic/common/DigestCalculator.scala b/src/main/scala/com/advancedtelematic/common/DigestCalculator.scala
index a5e8cbeb..c5a2f481 100644
--- a/src/main/scala/com/advancedtelematic/common/DigestCalculator.scala
+++ b/src/main/scala/com/advancedtelematic/common/DigestCalculator.scala
@@ -6,8 +6,8 @@ package com.advancedtelematic.common
 
 import java.security.MessageDigest
 
-import akka.stream.scaladsl.Sink
-import akka.util.ByteString
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.util.ByteString
 
 import scala.concurrent.{ExecutionContext, Future}
 
diff --git a/src/main/scala/com/advancedtelematic/data/GVariantEncoder.scala b/src/main/scala/com/advancedtelematic/data/GVariantEncoder.scala
index 862a0500..879baa0b 100644
--- a/src/main/scala/com/advancedtelematic/data/GVariantEncoder.scala
+++ b/src/main/scala/com/advancedtelematic/data/GVariantEncoder.scala
@@ -45,8 +45,7 @@ object GVariantEncoder {
 
           buf ++= ByteVector.fill(8 - buf.length % 8)(0)
 
-          buf ++= ByteVector.fromValidHex(superblockHash.value) ++ ByteVector.fromByte(0)
-            ++ ByteVector("ay".getBytes()) ++ ByteVector.fromByte(keyEndsAt.toByte)
+          buf ++= ByteVector.fromValidHex(superblockHash.value) ++ ByteVector.fromByte(0) ++ ByteVector("ay".getBytes()) ++ ByteVector.fromByte(keyEndsAt.toByte)
 
           val offsetBeforePadding = buf.length
 
diff --git a/src/main/scala/com/advancedtelematic/treehub/Boot.scala b/src/main/scala/com/advancedtelematic/treehub/Boot.scala
index 802d4511..6848dca2 100644
--- a/src/main/scala/com/advancedtelematic/treehub/Boot.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/Boot.scala
@@ -1,9 +1,9 @@
 package com.advancedtelematic.treehub
 
-import akka.actor.ActorSystem
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.Http.ServerBinding
-import akka.http.scaladsl.server.{Directives, Route}
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.Http.ServerBinding
+import org.apache.pekko.http.scaladsl.server.{Directives, Route}
 import com.advancedtelematic.libats.http.LogDirectives.*
 import com.advancedtelematic.libats.http.VersionDirectives.*
 import com.advancedtelematic.libats.http.tracing.Tracing
@@ -12,7 +12,7 @@ import com.advancedtelematic.libats.messaging.MessageBus
 import com.advancedtelematic.libats.slick.db.{BootMigrations, CheckMigrations, DatabaseSupport}
 import com.advancedtelematic.libats.slick.monitoring.DatabaseMetrics
 import com.advancedtelematic.metrics.prometheus.PrometheusMetricsSupport
-import com.advancedtelematic.metrics.{AkkaHttpConnectionMetrics, AkkaHttpRequestMetrics, MetricsSupport}
+import com.advancedtelematic.metrics.{PekkoHttpConnectionMetrics, PekkoHttpRequestMetrics, MetricsSupport}
 import com.advancedtelematic.treehub.daemon.{DeletedDeltaCleanupActor, StaleObjectArchiveActor}
 import com.advancedtelematic.treehub.delta_store.StaticDeltas
 import com.advancedtelematic.treehub.http.TreeHubRoutes
@@ -35,8 +35,8 @@ class TreehubBoot(override val globalConfig: Config,
     with DatabaseSupport
     with MetricsSupport
     with DatabaseMetrics
-    with AkkaHttpRequestMetrics
-    with AkkaHttpConnectionMetrics
+    with PekkoHttpRequestMetrics
+    with PekkoHttpConnectionMetrics
     with PrometheusMetricsSupport
     with CheckMigrations
     with VersionInfo
diff --git a/src/main/scala/com/advancedtelematic/treehub/Settings.scala b/src/main/scala/com/advancedtelematic/treehub/Settings.scala
index d593b915..7513f2f2 100644
--- a/src/main/scala/com/advancedtelematic/treehub/Settings.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/Settings.scala
@@ -2,7 +2,7 @@ package com.advancedtelematic.treehub
 
 import java.nio.file.Paths
 
-import akka.http.scaladsl.model.Uri
+import org.apache.pekko.http.scaladsl.model.Uri
 import com.advancedtelematic.treehub.object_store.S3Credentials
 import com.amazonaws.regions.Regions
 import com.typesafe.config.ConfigFactory
diff --git a/src/main/scala/com/advancedtelematic/treehub/daemon/DeletedDeltaCleanupActor.scala b/src/main/scala/com/advancedtelematic/treehub/daemon/DeletedDeltaCleanupActor.scala
index d5ed9869..e0f34aa6 100644
--- a/src/main/scala/com/advancedtelematic/treehub/daemon/DeletedDeltaCleanupActor.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/daemon/DeletedDeltaCleanupActor.scala
@@ -1,8 +1,8 @@
 package com.advancedtelematic.treehub.daemon
 
-import akka.actor.{Actor, ActorLogging, Props}
-import akka.actor.Status.Failure
-import akka.pattern.{BackoffOpts, BackoffSupervisor}
+import org.apache.pekko.actor.{Actor, ActorLogging, Props}
+import org.apache.pekko.actor.Status.Failure
+import org.apache.pekko.pattern.{BackoffOpts, BackoffSupervisor}
 import com.advancedtelematic.data.DataType.StaticDeltaMeta
 import com.advancedtelematic.treehub.daemon.DeletedDeltaCleanupActor.{Done, Tick, defaultTickInterval}
 import com.advancedtelematic.treehub.db.StaticDeltaMetaRepositorySupport
@@ -29,7 +29,7 @@ class DeletedDeltaCleanupActor(storage: BlobStore, tickInterval: FiniteDuration
   with StaticDeltaMetaRepositorySupport
   with ActorLogging {
 
-  import akka.pattern.pipe
+  import org.apache.pekko.pattern.pipe
 
   import scala.async.Async.*
 
diff --git a/src/main/scala/com/advancedtelematic/treehub/daemon/StaleObjectArchiveActor.scala b/src/main/scala/com/advancedtelematic/treehub/daemon/StaleObjectArchiveActor.scala
index a1a51452..2b8c4be6 100644
--- a/src/main/scala/com/advancedtelematic/treehub/daemon/StaleObjectArchiveActor.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/daemon/StaleObjectArchiveActor.scala
@@ -1,11 +1,11 @@
 package com.advancedtelematic.treehub.daemon
 
 import java.time.Instant
-import akka.actor.Status.Failure
-import akka.actor.{Actor, ActorLogging, Props}
-import akka.pattern.{BackoffOpts, BackoffSupervisor}
-import akka.stream.Materializer
-import akka.stream.scaladsl.{Flow, Sink}
+import org.apache.pekko.actor.Status.Failure
+import org.apache.pekko.actor.{Actor, ActorLogging, Props}
+import org.apache.pekko.pattern.{BackoffOpts, BackoffSupervisor}
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.{Flow, Sink}
 import com.advancedtelematic.data.DataType.{ObjectId, ObjectStatus, TObject}
 import com.advancedtelematic.treehub.daemon.StaleObjectArchiveActor.{Done, Tick}
 import com.advancedtelematic.treehub.db.{ArchivedObjectRepositorySupport, ObjectRepositorySupport}
@@ -35,7 +35,7 @@ class StaleObjectArchiveActor(blobStore: BlobStore, objectsExpireAfter: java.tim
   with ArchivedObjectRepositorySupport
   with ActorLogging {
 
-  import akka.pattern.pipe
+  import org.apache.pekko.pattern.pipe
   import context.dispatcher
 
   import scala.async.Async.*
diff --git a/src/main/scala/com/advancedtelematic/treehub/db/DbOps.scala b/src/main/scala/com/advancedtelematic/treehub/db/DbOps.scala
index 54f28181..9b805152 100644
--- a/src/main/scala/com/advancedtelematic/treehub/db/DbOps.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/db/DbOps.scala
@@ -1,9 +1,13 @@
 package com.advancedtelematic.treehub.db
 
+import com.advancedtelematic.libats.data.PaginationResult.{Limit, Offset}
+
 object DbOps {
-  implicit class PaginationResultOps(x: Option[Long]) {
-    def orDefaultOffset: Long = x.getOrElse(0L)
+  implicit class PaginationResultOffsetOps(x: Option[Offset]) {
+    def orDefaultOffset: Offset = x.getOrElse(Offset(0))
+  }
 
-    def orDefaultLimit: Long = x.getOrElse(50L)
+  implicit class PaginationResultLimitOps(x: Option[Limit]) {
+      def orDefaultLimit: Limit = x.getOrElse(Limit(50L))
   }
 }
diff --git a/src/main/scala/com/advancedtelematic/treehub/db/ObjectRepository.scala b/src/main/scala/com/advancedtelematic/treehub/db/ObjectRepository.scala
index c6be4f8b..0ef1d154 100644
--- a/src/main/scala/com/advancedtelematic/treehub/db/ObjectRepository.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/db/ObjectRepository.scala
@@ -2,8 +2,8 @@ package com.advancedtelematic.treehub.db
 
 import java.time.Instant
 
-import akka.NotUsed
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl.Source
 import com.advancedtelematic.data.DataType.ObjectStatus.ObjectStatus
 import com.advancedtelematic.data.DataType.{ObjectId, ObjectStatus, TObject}
 import com.advancedtelematic.libats.data.DataType.Namespace
diff --git a/src/main/scala/com/advancedtelematic/treehub/db/StaticDeltaMetaRepository.scala b/src/main/scala/com/advancedtelematic/treehub/db/StaticDeltaMetaRepository.scala
index bb85fabe..71831991 100644
--- a/src/main/scala/com/advancedtelematic/treehub/db/StaticDeltaMetaRepository.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/db/StaticDeltaMetaRepository.scala
@@ -4,6 +4,7 @@ import com.advancedtelematic.data.ClientDataType.StaticDelta
 import com.advancedtelematic.data.DataType.{DeltaId, StaticDeltaMeta, SuperBlockHash}
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.libats.data.PaginationResult
+import com.advancedtelematic.libats.data.PaginationResult.{Limit, Offset}
 import com.advancedtelematic.libats.messaging_datatype.DataType.Commit
 import com.advancedtelematic.libats.slick.codecs.SlickRefined.*
 import com.advancedtelematic.libats.slick.db.SlickAnyVal.*
@@ -50,7 +51,7 @@ protected class StaticDeltaMetaRepository()(implicit db: Database, ec: Execution
       .result
   }
 
-  def findAll(ns: Namespace, status: StaticDeltaMeta.Status, offset: Long, limit: Long): Future[PaginationResult[StaticDelta]] = db.run {
+  def findAll(ns: Namespace, status: StaticDeltaMeta.Status, offset: Offset, limit: Limit): Future[PaginationResult[StaticDelta]] = db.run {
     staticDeltas
       .filter(_.namespace === ns)
       .filter(_.status === status)
diff --git a/src/main/scala/com/advancedtelematic/treehub/delta_store/StaticDeltas.scala b/src/main/scala/com/advancedtelematic/treehub/delta_store/StaticDeltas.scala
index aa1dba25..06142ab0 100644
--- a/src/main/scala/com/advancedtelematic/treehub/delta_store/StaticDeltas.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/delta_store/StaticDeltas.scala
@@ -1,15 +1,16 @@
 package com.advancedtelematic.treehub.delta_store
 
-import akka.http.scaladsl.model.HttpResponse
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.http.scaladsl.model.HttpResponse
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.data.ClientDataType.{CommitInfo, CommitSize, StaticDelta}
 import com.advancedtelematic.data.DataType.{DeltaId, DeltaIndexId, StaticDeltaIndex, StaticDeltaMeta, SuperBlockHash}
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.libats.data.PaginationResult
+import com.advancedtelematic.libats.data.PaginationResult.{Limit, Offset}
 import com.advancedtelematic.libats.messaging_datatype.DataType.Commit
-import com.advancedtelematic.treehub.db.DbOps.PaginationResultOps
+import com.advancedtelematic.treehub.db.DbOps.{PaginationResultLimitOps, PaginationResultOffsetOps}
 import com.advancedtelematic.treehub.db.StaticDeltaMetaRepositorySupport
 import com.advancedtelematic.treehub.http.Errors
 import com.advancedtelematic.treehub.object_store.BlobStore
@@ -17,7 +18,6 @@ import org.slf4j.LoggerFactory
 import slick.jdbc.MySQLProfile.api.*
 
 import scala.async.Async.{async, await}
-import scala.collection.{immutable, mutable}
 import scala.concurrent.{ExecutionContext, Future}
 
 class StaticDeltas(storage: BlobStore)(implicit val db: Database, ec: ExecutionContext) extends StaticDeltaMetaRepositorySupport {
@@ -63,7 +63,7 @@ class StaticDeltas(storage: BlobStore)(implicit val db: Database, ec: ExecutionC
     }
   }
 
-  def getAll(ns: Namespace, offset: Option[Long] = None, limit: Option[Long] = None): Future[PaginationResult[StaticDelta]] =
+  def getAll(ns: Namespace, offset: Option[Offset] = None, limit: Option[Limit] = None): Future[PaginationResult[StaticDelta]] =
     staticDeltaMetaRepository.findAll(ns, StaticDeltaMeta.Status.Available, offset.orDefaultOffset, limit.orDefaultLimit)
 
   def store(ns: Namespace, deltaId: DeltaId, path: String, data: Source[ByteString, ?], size: Long,
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/ConfResource.scala b/src/main/scala/com/advancedtelematic/treehub/http/ConfResource.scala
index fd4202a3..ff5d4cba 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/ConfResource.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/ConfResource.scala
@@ -2,7 +2,7 @@ package com.advancedtelematic.treehub.http
 
 class ConfResource {
 
-  import akka.http.scaladsl.server.Directives._
+  import org.apache.pekko.http.scaladsl.server.Directives._
 
   val route = path("config") {
 
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/DeltaResource.scala b/src/main/scala/com/advancedtelematic/treehub/http/DeltaResource.scala
index 47a7c133..2ae8f7c2 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/DeltaResource.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/DeltaResource.scala
@@ -1,7 +1,7 @@
 package com.advancedtelematic.treehub.http
-import akka.http.scaladsl.model.*
-import akka.http.scaladsl.model.headers.Location
-import akka.http.scaladsl.server.*
+import org.apache.pekko.http.scaladsl.model.*
+import org.apache.pekko.http.scaladsl.model.headers.Location
+import org.apache.pekko.http.scaladsl.server.*
 import com.advancedtelematic.data.ClientDataType.CommitInfoRequest
 import com.advancedtelematic.data.DataType.{CommitTupleOps, DeltaId, SuperBlockHash}
 import com.advancedtelematic.data.GVariantEncoder.*
@@ -18,12 +18,13 @@ import io.circe.syntax.EncoderOps
 import org.slf4j.LoggerFactory
 
 import scala.util.Success
+import com.advancedtelematic.libats.data.PaginationResult.*
 
 class DeltaResource(namespace: Directive1[Namespace],
                     staticDeltas: StaticDeltas,
                     usageHandler: UsageMetricsRouter.HandlerRef) {
 
-  import akka.http.scaladsl.server.Directives.*
+  import org.apache.pekko.http.scaladsl.server.Directives.*
 
   val _log = LoggerFactory.getLogger(this.getClass)
 
@@ -69,7 +70,7 @@ class DeltaResource(namespace: Directive1[Namespace],
             }
           } ~
             post {
-              import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport._
+              import com.github.pjfanning.pekkohttpcirce.FailFastCirceSupport._
               implicit val commitKeyEncoder: KeyEncoder[Commit] = KeyEncoder.encodeKeyString.contramap(_.value)
 
               entity(as[CommitInfoRequest]) { request =>
@@ -80,15 +81,14 @@ class DeltaResource(namespace: Directive1[Namespace],
             (delete & path(PrefixedDeltaIdPath)) { id =>
               val f = staticDeltas.markDeleted(ns, id)
               complete(f.map(_ => StatusCodes.Accepted))
-            }
-            ~
+            } ~
             (pathEnd & parameters(Symbol("from").as[Commit], Symbol("to").as[Commit])) { (from, to) =>
               val deltaId = (from, to).toDeltaId
               val uri = Uri(s"/deltas/${deltaId.asPrefixedPath}")
               complete(HttpResponse(StatusCodes.Found, headers = List(Location(uri))))
             } ~
             (pathEnd & parameters(Symbol("offset").as(nonNegativeLong).?, Symbol("limit").as(nonNegativeLong).?)) { (offset, limit) =>
-              val f = staticDeltas.getAll(ns, offset, limit).map(_.asJson.toString())
+              val f = staticDeltas.getAll(ns, offset.map(_.toOffset), limit.map(_.toLimit)).map(_.asJson.toString())
               complete(f)
             }
         }
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/Errors.scala b/src/main/scala/com/advancedtelematic/treehub/http/Errors.scala
index 3a1b94d3..7e7b777a 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/Errors.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/Errors.scala
@@ -1,6 +1,6 @@
 package com.advancedtelematic.treehub.http
 
-import akka.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.model.StatusCodes
 import com.advancedtelematic.data.DataType.{DeltaId, ObjectId, SuperBlockHash}
 import com.advancedtelematic.libats.data.ErrorCode
 import com.advancedtelematic.libats.http.Errors.{Error, RawError}
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/ManifestResource.scala b/src/main/scala/com/advancedtelematic/treehub/http/ManifestResource.scala
index e68cc4bb..93df66cd 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/ManifestResource.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/ManifestResource.scala
@@ -2,9 +2,9 @@ package com.advancedtelematic.treehub.http
 
 import java.time.Instant
 
-import akka.http.scaladsl.model.StatusCodes
-import akka.http.scaladsl.server.Directive1
-import akka.stream.Materializer
+import org.apache.pekko.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.server.Directive1
+import org.apache.pekko.stream.Materializer
 import com.advancedtelematic.data.DataType.ObjectId
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.libats.messaging.MessageBusPublisher
@@ -12,7 +12,7 @@ import com.advancedtelematic.libats.messaging_datatype.DataType.ValidCommit
 import com.advancedtelematic.libats.messaging_datatype.Messages.CommitManifestUpdated
 import com.advancedtelematic.treehub.db.ManifestRepositorySupport
 import com.advancedtelematic.treehub.http.ManifestParser.ManifestInfo
-import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport._
+import com.github.pjfanning.pekkohttpcirce.FailFastCirceSupport._
 import io.circe.{Decoder, DecodingFailure}
 import slick.jdbc.MySQLProfile.api._
 
@@ -25,7 +25,7 @@ class ManifestResource(namespace: Directive1[Namespace],
                        messageBus: MessageBusPublisher)
                       (implicit db: Database, ec: ExecutionContext, mat: Materializer) extends ManifestRepositorySupport {
 
-  import akka.http.scaladsl.server.Directives._
+  import org.apache.pekko.http.scaladsl.server.Directives._
 
   private val CommitPath = Segment.flatMap(s =>  eu.timepit.refined.refineV[ValidCommit](s).toOption)
 
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/ObjectResource.scala b/src/main/scala/com/advancedtelematic/treehub/http/ObjectResource.scala
index 1b142ca2..39204f47 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/ObjectResource.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/ObjectResource.scala
@@ -1,9 +1,9 @@
 package com.advancedtelematic.treehub.http
 
 import java.io.File
-import akka.http.scaladsl.model.StatusCodes
-import akka.http.scaladsl.server.*
-import akka.stream.Materializer
+import org.apache.pekko.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.server.*
+import org.apache.pekko.stream.Materializer
 import com.advancedtelematic.data.DataType
 import com.advancedtelematic.data.DataType.ObjectId
 import com.advancedtelematic.libats.data.DataType.Namespace
@@ -22,7 +22,7 @@ class ObjectResource(namespace: Directive1[Namespace],
                      objectStore: ObjectStore,
                      usageHandler: UsageMetricsRouter.HandlerRef)
                     (implicit db: Database, ec: ExecutionContext) {
-  import akka.http.scaladsl.server.Directives.*
+  import org.apache.pekko.http.scaladsl.server.Directives.*
 
   private def hintNamespaceStorage(namespace: Namespace): Directive0 = mapResponse { resp =>
     if(resp.status.isSuccess())
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/OutOfBandStorageHeader.scala b/src/main/scala/com/advancedtelematic/treehub/http/OutOfBandStorageHeader.scala
index a878994d..9f37264c 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/OutOfBandStorageHeader.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/OutOfBandStorageHeader.scala
@@ -1,6 +1,6 @@
 package com.advancedtelematic.treehub.http
 
-import akka.http.scaladsl.model.headers._
+import org.apache.pekko.http.scaladsl.model.headers._
 
 import scala.util.{Failure, Success, Try}
 
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/PathMatchers.scala b/src/main/scala/com/advancedtelematic/treehub/http/PathMatchers.scala
index 3548617d..289c47a7 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/PathMatchers.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/PathMatchers.scala
@@ -1,11 +1,11 @@
 package com.advancedtelematic.treehub.http
 
-import akka.http.scaladsl.server.PathMatcher1
+import org.apache.pekko.http.scaladsl.server.PathMatcher1
 import com.advancedtelematic.data.DataType.{ObjectId, ValidDeltaId, ValidDeltaIndexId}
 import com.advancedtelematic.libats.data.RefinedUtils.*
 
 object PathMatchers {
-  import akka.http.scaladsl.server.Directives.*
+  import org.apache.pekko.http.scaladsl.server.Directives.*
 
   val PrefixedObjectId: PathMatcher1[ObjectId] = (Segment / Segment).tflatMap { case (oprefix, osuffix) =>
     ObjectId.parse(oprefix + osuffix).toOption.map(Tuple1(_))
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/RefResource.scala b/src/main/scala/com/advancedtelematic/treehub/http/RefResource.scala
index c8a33111..5d5b0f5b 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/RefResource.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/RefResource.scala
@@ -1,7 +1,7 @@
 package com.advancedtelematic.treehub.http
 
-import akka.http.scaladsl.server.{Directive, Directive1, Route}
-import akka.stream.Materializer
+import org.apache.pekko.http.scaladsl.server.{Directive, Directive1, Route}
+import org.apache.pekko.stream.Materializer
 import com.advancedtelematic.data.DataType.{Ref, RefName}
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.libats.messaging_datatype.DataType.Commit
@@ -17,7 +17,7 @@ class RefResource(namespace: Directive1[Namespace], objectStore: ObjectStore)
                  (implicit db: Database, ec: ExecutionContext, mat: Materializer)
   extends RefRepositorySupport {
 
-  import akka.http.scaladsl.server.Directives._
+  import org.apache.pekko.http.scaladsl.server.Directives._
   import com.advancedtelematic.libats.http.RefinedMarshallingSupport._
 
   private val refUpdateProcess = new RefUpdateProcess(objectStore)
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/RefUpdateProcess.scala b/src/main/scala/com/advancedtelematic/treehub/http/RefUpdateProcess.scala
index 2fa9af38..d620dff3 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/RefUpdateProcess.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/RefUpdateProcess.scala
@@ -1,7 +1,7 @@
 package com.advancedtelematic.treehub.http
 
-import akka.http.scaladsl.marshalling.ToResponseMarshallable
-import akka.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.marshalling.ToResponseMarshallable
+import org.apache.pekko.http.scaladsl.model.StatusCodes
 import com.advancedtelematic.data.DataType.{ObjectId, Ref, RefName, _}
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.treehub.db.RefRepositorySupport
@@ -9,7 +9,7 @@ import com.advancedtelematic.treehub.object_store.ObjectStore
 import slick.jdbc.MySQLProfile.api._
 import com.advancedtelematic.libats.codecs.CirceCodecs._
 import com.advancedtelematic.libats.messaging_datatype.DataType.Commit
-import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport._
+import com.github.pjfanning.pekkohttpcirce.FailFastCirceSupport._
 
 import scala.concurrent.{ExecutionContext, Future}
 
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/RefUpdateValidation.scala b/src/main/scala/com/advancedtelematic/treehub/http/RefUpdateValidation.scala
index cfaf88ca..f4b7049f 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/RefUpdateValidation.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/RefUpdateValidation.scala
@@ -1,6 +1,6 @@
 package com.advancedtelematic.treehub.http
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.common.DigestCalculator
 import com.advancedtelematic.data.DataType.{TObject, _}
 import org.slf4j.LoggerFactory
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/TreeHubRoutes.scala b/src/main/scala/com/advancedtelematic/treehub/http/TreeHubRoutes.scala
index 5a460d0e..e54ba6e8 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/TreeHubRoutes.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/TreeHubRoutes.scala
@@ -1,8 +1,8 @@
 package com.advancedtelematic.treehub.http
 
-import akka.http.scaladsl.model.StatusCodes
-import akka.http.scaladsl.server.*
-import akka.stream.Materializer
+import org.apache.pekko.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.server.*
+import org.apache.pekko.stream.Materializer
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.libats.data.ErrorRepresentation
 import com.advancedtelematic.libats.data.ErrorRepresentation.*
@@ -14,7 +14,7 @@ import com.advancedtelematic.treehub.delta_store.StaticDeltas
 import com.advancedtelematic.treehub.object_store.ObjectStore
 import com.advancedtelematic.treehub.repo_metrics.UsageMetricsRouter
 import com.amazonaws.SdkClientException
-import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport.*
+import com.github.pjfanning.pekkohttpcirce.FailFastCirceSupport.*
 import slick.jdbc.MySQLProfile.api.*
 
 import scala.concurrent.ExecutionContext
diff --git a/src/main/scala/com/advancedtelematic/treehub/http/http.scala b/src/main/scala/com/advancedtelematic/treehub/http/http.scala
index ca8792ec..5460fbe6 100644
--- a/src/main/scala/com/advancedtelematic/treehub/http/http.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/http/http.scala
@@ -1,7 +1,7 @@
 package com.advancedtelematic.treehub
 
-import akka.http.scaladsl.unmarshalling.{PredefinedFromStringUnmarshallers, Unmarshaller}
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.unmarshalling.{PredefinedFromStringUnmarshallers, Unmarshaller}
+import org.apache.pekko.http.scaladsl.util.FastFuture
 
 package object http {
   val nonNegativeLong: Unmarshaller[String, Long] =
diff --git a/src/main/scala/com/advancedtelematic/treehub/object_store/BlobStore.scala b/src/main/scala/com/advancedtelematic/treehub/object_store/BlobStore.scala
index 51eb72d0..277de70a 100644
--- a/src/main/scala/com/advancedtelematic/treehub/object_store/BlobStore.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/object_store/BlobStore.scala
@@ -1,9 +1,9 @@
 package com.advancedtelematic.treehub.object_store
 
-import akka.Done
-import akka.http.scaladsl.model.*
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.Done
+import org.apache.pekko.http.scaladsl.model.*
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.data.DataType.ObjectId
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.treehub.object_store.BlobStore.OutOfBandStoreResult
diff --git a/src/main/scala/com/advancedtelematic/treehub/object_store/LocalFsBlobStore.scala b/src/main/scala/com/advancedtelematic/treehub/object_store/LocalFsBlobStore.scala
index 1cf75a09..6c031f16 100644
--- a/src/main/scala/com/advancedtelematic/treehub/object_store/LocalFsBlobStore.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/object_store/LocalFsBlobStore.scala
@@ -1,11 +1,11 @@
 package com.advancedtelematic.treehub.object_store
 
-import akka.Done
-import akka.http.scaladsl.model.HttpResponse
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.Materializer
-import akka.stream.scaladsl.{FileIO, Source}
-import akka.util.ByteString
+import org.apache.pekko.Done
+import org.apache.pekko.http.scaladsl.model.HttpResponse
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.{FileIO, Source}
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.treehub.http.Errors
 import org.slf4j.LoggerFactory
diff --git a/src/main/scala/com/advancedtelematic/treehub/object_store/ObjectStore.scala b/src/main/scala/com/advancedtelematic/treehub/object_store/ObjectStore.scala
index 2c70d0c1..7c5b18cf 100644
--- a/src/main/scala/com/advancedtelematic/treehub/object_store/ObjectStore.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/object_store/ObjectStore.scala
@@ -1,12 +1,12 @@
 package com.advancedtelematic.treehub.object_store
 
-import akka.Done
+import org.apache.pekko.Done
 
 import java.io.File
-import akka.http.scaladsl.model.HttpResponse
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.scaladsl.{FileIO, Source}
-import akka.util.ByteString
+import org.apache.pekko.http.scaladsl.model.HttpResponse
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.scaladsl.{FileIO, Source}
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.data.DataType.{ObjectId, ObjectStatus, TObject}
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.treehub.db.ObjectRepositorySupport
diff --git a/src/main/scala/com/advancedtelematic/treehub/object_store/S3BlobStore.scala b/src/main/scala/com/advancedtelematic/treehub/object_store/S3BlobStore.scala
index 5bc256d7..6fb6d1d1 100644
--- a/src/main/scala/com/advancedtelematic/treehub/object_store/S3BlobStore.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/object_store/S3BlobStore.scala
@@ -1,12 +1,12 @@
 package com.advancedtelematic.treehub.object_store
 
-import akka.Done
-import akka.http.scaladsl.model.headers.Location
-import akka.http.scaladsl.model.{HttpResponse, StatusCodes, Uri}
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.Materializer
-import akka.stream.scaladsl.{Source, StreamConverters}
-import akka.util.ByteString
+import org.apache.pekko.Done
+import org.apache.pekko.http.scaladsl.model.headers.Location
+import org.apache.pekko.http.scaladsl.model.{HttpResponse, StatusCodes, Uri}
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.{Source, StreamConverters}
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.common.DigestCalculator
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.treehub.object_store.BlobStore.UploadAt
@@ -45,7 +45,7 @@ class S3BlobStore(s3Credentials: S3Credentials, s3client: AmazonS3, allowRedirec
     val sink =  StreamConverters.asInputStream().mapMaterializedValue { is =>
       val meta = new ObjectMetadata()
       meta.setContentLength(size)
-      val request = new PutObjectRequest(s3Credentials.blobBucketId, filename, is, meta).withCannedAcl(CannedAccessControlList.AuthenticatedRead)
+      val request = new PutObjectRequest(s3Credentials.blobBucketId, filename, is, meta)
 
       log.info(s"Uploading $filename to amazon s3")
 
diff --git a/src/main/scala/com/advancedtelematic/treehub/repo_metrics/StorageUpdate.scala b/src/main/scala/com/advancedtelematic/treehub/repo_metrics/StorageUpdate.scala
index efcdb6c9..18c7f765 100644
--- a/src/main/scala/com/advancedtelematic/treehub/repo_metrics/StorageUpdate.scala
+++ b/src/main/scala/com/advancedtelematic/treehub/repo_metrics/StorageUpdate.scala
@@ -3,9 +3,9 @@ package com.advancedtelematic.treehub.repo_metrics
 import java.time.Instant
 import java.util.UUID
 import scala.concurrent.duration.*
-import akka.actor.{Actor, ActorLogging, ActorRef, ActorSystem, Props, Status}
-import akka.stream.{ActorMaterializer, OverflowStrategy}
-import akka.stream.scaladsl.{Sink, Source}
+import org.apache.pekko.actor.{Actor, ActorLogging, ActorRef, ActorSystem, Props, Status}
+import org.apache.pekko.stream.{ActorMaterializer, OverflowStrategy}
+import org.apache.pekko.stream.scaladsl.{Sink, Source}
 import com.advancedtelematic.data.DataType.ObjectId
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.libats.messaging.MessageBusPublisher
@@ -113,7 +113,7 @@ protected object BandwidthUpdate {
 
 protected class BandwidthUpdate(publisher: MessageBusPublisher, objectStore: ObjectStore) extends Actor with ActorLogging {
   import context.dispatcher
-  import akka.pattern.pipe
+  import org.apache.pekko.pattern.pipe
 
   private def update(namespace: Namespace, usedBandwidthBytes: Long, objectId: ObjectId): Future[Done] = {
     val uuid = UUID.nameUUIDFromBytes(Instant.now.toString.getBytes ++ objectId.value.getBytes)
diff --git a/src/test/scala/com/advancedtelematic/treehub/daemon/DeletedDeltaCleanupActorSpec.scala b/src/test/scala/com/advancedtelematic/treehub/daemon/DeletedDeltaCleanupActorSpec.scala
index 1c9a318c..83f992dc 100644
--- a/src/test/scala/com/advancedtelematic/treehub/daemon/DeletedDeltaCleanupActorSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/daemon/DeletedDeltaCleanupActorSpec.scala
@@ -1,9 +1,9 @@
 package com.advancedtelematic.treehub.daemon
 
-import akka.actor.{ActorRef, ActorSystem, PoisonPill}
-import akka.stream.scaladsl.Source
-import akka.testkit.{ImplicitSender, TestException, TestKitBase}
-import akka.util.ByteString
+import org.apache.pekko.actor.{ActorRef, ActorSystem, PoisonPill}
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.testkit.{ImplicitSender, TestException, TestKitBase}
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.common.DigestCalculator
 import com.advancedtelematic.data.DataType.{CommitTupleOps, StaticDeltaMeta, SuperBlockHash}
 import com.advancedtelematic.libats.data.DataType
@@ -71,7 +71,7 @@ class DeletedDeltaCleanupActorSpec extends DeletedDeltaCleanupActorSpecUtil {
     storage.exists(defaultNs, deltaId.asPrefixedPath.resolve("superblock")).futureValue shouldBe true
 
     // Mark delta for deletion
-    deltas.markDeleted(defaultNs, deltaId)
+    deltas.markDeleted(defaultNs, deltaId).futureValue
 
     // Validate delta is not available anymore
     staticDeltaMetaRepository.find(defaultNs, deltaId).failed.futureValue shouldBe Errors.StaticDeltaDoesNotExist
@@ -108,7 +108,7 @@ class DeletedDeltaCleanupActorSpec extends DeletedDeltaCleanupActorSpecUtil {
 
     subject ! Done(0, 0)
 
-    deltas.markDeleted(defaultNs, deltaId)
+    deltas.markDeleted(defaultNs, deltaId).futureValue
 
     eventually({
       // Validate delta parts were deleted from storage
@@ -202,8 +202,8 @@ class DeletedDeltaCleanupActorMockStorageSpec extends DeletedDeltaCleanupActorSp
     result2.status shouldBe StaticDeltaMeta.Status.Available
 
     // Mark deltas for deletion
-    deltas.markDeleted(defaultNs, deltaId1)
-    deltas.markDeleted(defaultNs, deltaId2)
+    deltas.markDeleted(defaultNs, deltaId1).futureValue
+    deltas.markDeleted(defaultNs, deltaId2).futureValue
 
     // Validate deltas are not available anymore
     staticDeltaMetaRepository.find(defaultNs, deltaId1).failed.futureValue shouldBe Errors.StaticDeltaDoesNotExist
diff --git a/src/test/scala/com/advancedtelematic/treehub/daemon/MockBlobStore.scala b/src/test/scala/com/advancedtelematic/treehub/daemon/MockBlobStore.scala
index 04cec133..8a8451fe 100644
--- a/src/test/scala/com/advancedtelematic/treehub/daemon/MockBlobStore.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/daemon/MockBlobStore.scala
@@ -1,10 +1,13 @@
 package com.advancedtelematic.treehub.daemon
 
-import akka.stream.scaladsl.Source
-import akka.testkit.TestException
-import akka.util.ByteString
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.testkit.TestException
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.libats.data.DataType
 import com.advancedtelematic.treehub.object_store.BlobStore
+import com.advancedtelematic.treehub.object_store.BlobStore.OutOfBandStoreResult
+import org.apache.pekko.Done
+import org.apache.pekko.http.scaladsl.model.HttpResponse
 
 import java.nio.file.Path
 import scala.concurrent.{ExecutionContext, Future}
@@ -20,17 +23,17 @@ class MockBlobStore(implicit ec: ExecutionContext) extends BlobStore {
   }
 
   // BlobStore trait overrides
-  override def deleteObject(ns: DataType.Namespace, path: Path) = Future { throw TestException("failed") }
-  override def deleteObjects(ns: DataType.Namespace, pathPrefix: Path) = Future {
+  override def deleteObject(ns: DataType.Namespace, path: Path): Future[Done] = Future { throw TestException("failed") }
+  override def deleteObjects(ns: DataType.Namespace, pathPrefix: Path): Future[Done] = Future {
     if (failingPaths.contains(pathPrefix))
       throw TestException("failed")
     else
-      akka.Done
+      Done
   }
-  override def storeStream(namespace: DataType.Namespace, path: Path, size: Long, blob: Source[ByteString, _]) = Future { 123L }
+  override def storeStream(namespace: DataType.Namespace, path: Path, size: Long, blob: Source[ByteString, _]): Future[Long] = Future { 123L }
   override val supportsOutOfBandStorage = false
-  override def storeOutOfBand(namespace: DataType.Namespace, path: Path) = Future { throw TestException("failed") }
-  override def buildResponse(namespace: DataType.Namespace, path: Path) = Future { throw TestException("failed") }
-  override def readFull(namespace: DataType.Namespace, path: Path) = Future { throw TestException("failed") }
-  override def exists(namespace: DataType.Namespace, path: Path) = Future { throw TestException("failed") }
+  override def storeOutOfBand(namespace: DataType.Namespace, path: Path): Future[OutOfBandStoreResult] = Future { throw TestException("failed") }
+  override def buildResponse(namespace: DataType.Namespace, path: Path): Future[HttpResponse] = Future { throw TestException("failed") }
+  override def readFull(namespace: DataType.Namespace, path: Path): Future[ByteString] = Future { throw TestException("failed") }
+  override def exists(namespace: DataType.Namespace, path: Path): Future[Boolean] = Future { throw TestException("failed") }
 }
\ No newline at end of file
diff --git a/src/test/scala/com/advancedtelematic/treehub/daemon/StaleObjectArchiveActorSpec.scala b/src/test/scala/com/advancedtelematic/treehub/daemon/StaleObjectArchiveActorSpec.scala
index a82d26e1..968ed02a 100644
--- a/src/test/scala/com/advancedtelematic/treehub/daemon/StaleObjectArchiveActorSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/daemon/StaleObjectArchiveActorSpec.scala
@@ -4,8 +4,8 @@ import java.nio.file.{Files, Paths}
 import java.sql.Timestamp
 import java.time.Instant
 import java.time.temporal.ChronoUnit
-import akka.actor.{ActorRef, ActorSystem, PoisonPill}
-import akka.testkit.{ImplicitSender, TestKitBase}
+import org.apache.pekko.actor.{ActorRef, ActorSystem, PoisonPill}
+import org.apache.pekko.testkit.{ImplicitSender, TestKitBase}
 import com.advancedtelematic.data.DataType.{ObjectStatus, TObject}
 import com.advancedtelematic.util.LongTest
 import com.advancedtelematic.treehub.daemon.StaleObjectArchiveActor.{Done, Tick}
diff --git a/src/test/scala/com/advancedtelematic/treehub/delta_store/S3DeltaStorageIntegrationSpec.scala b/src/test/scala/com/advancedtelematic/treehub/delta_store/S3DeltaStorageIntegrationSpec.scala
index d55525c4..03796d8e 100644
--- a/src/test/scala/com/advancedtelematic/treehub/delta_store/S3DeltaStorageIntegrationSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/delta_store/S3DeltaStorageIntegrationSpec.scala
@@ -1,7 +1,7 @@
 package com.advancedtelematic.treehub.delta_store
 
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.common.DigestCalculator
 import com.advancedtelematic.data.DataType.{CommitTupleOps, SuperBlockHash}
 import com.advancedtelematic.libats.data.RefinedUtils.RefineTry
@@ -27,7 +27,7 @@ class S3DeltaStorageIntegrationSpec extends TreeHubSpec with ResourceSpec with B
 
   override val deltas = new StaticDeltas(s3DeltaStore)
 
-  override implicit def patienceConfig = PatienceConfig().copy(timeout = Span(5, Seconds))
+  override implicit def patienceConfig: PatienceConfig = PatienceConfig().copy(timeout = Span(5, Seconds))
 
   test("returns static delta part") {
     val superblockHash = RefType.applyRef[SuperBlockHash](randomHash()).toOption.get
diff --git a/src/test/scala/com/advancedtelematic/treehub/http/DeltaResourceSpec.scala b/src/test/scala/com/advancedtelematic/treehub/http/DeltaResourceSpec.scala
index f9edad74..d4e4eeca 100644
--- a/src/test/scala/com/advancedtelematic/treehub/http/DeltaResourceSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/http/DeltaResourceSpec.scala
@@ -1,13 +1,13 @@
 package com.advancedtelematic.treehub.http
 
-import akka.http.scaladsl.model.{HttpRequest, StatusCodes}
-import akka.http.scaladsl.model.headers.{Location, RawHeader}
+import org.apache.pekko.http.scaladsl.model.{HttpRequest, StatusCodes}
+import org.apache.pekko.http.scaladsl.model.headers.{Location, RawHeader}
 import com.advancedtelematic.data.DataType.{CommitTupleOps, DeltaIndexId, StaticDeltaMeta, SuperBlockHash, ValidDeltaId, ValidDeltaIndexId}
 import com.advancedtelematic.treehub.db.{ObjectRepositorySupport, StaticDeltaMetaRepositorySupport}
 import com.advancedtelematic.util.{ResourceSpec, TreeHubSpec}
 import com.advancedtelematic.libats.data.RefinedUtils.RefineTry
 import com.advancedtelematic.util.FakeUsageUpdate.CurrentBandwith
-import akka.pattern.ask
+import org.apache.pekko.pattern.ask
 
 import scala.concurrent.duration.*
 import com.advancedtelematic.common.DigestCalculator
@@ -210,7 +210,7 @@ class DeltaResourceSpec extends TreeHubSpec with ResourceSpec with ObjectReposit
 
     val request = CommitInfoRequest(Seq(commit1, commit2, commit3, commit4))
 
-    import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport._
+    import com.github.pjfanning.pekkohttpcirce.FailFastCirceSupport._
 
     Post(apiUri("deltas"), request) ~> routes ~> check {
       status shouldBe StatusCodes.OK
@@ -237,7 +237,7 @@ class DeltaResourceSpec extends TreeHubSpec with ResourceSpec with ObjectReposit
 
     val request = CommitInfoRequest(Seq(commit3))
 
-    import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport._
+    import com.github.pjfanning.pekkohttpcirce.FailFastCirceSupport._
 
     Post(apiUri("deltas"), request) ~> routes ~> check {
       status shouldBe StatusCodes.OK
diff --git a/src/test/scala/com/advancedtelematic/treehub/http/ManifestResourceSpec.scala b/src/test/scala/com/advancedtelematic/treehub/http/ManifestResourceSpec.scala
index 843d2127..db1b5cd2 100644
--- a/src/test/scala/com/advancedtelematic/treehub/http/ManifestResourceSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/http/ManifestResourceSpec.scala
@@ -1,13 +1,13 @@
 package com.advancedtelematic.treehub.http
 
 import java.nio.file.Paths
-import akka.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.model.StatusCodes
 import cats.syntax.either._
 import com.advancedtelematic.libats.messaging_datatype.Messages.CommitManifestUpdated
 import com.advancedtelematic.treehub.db.ManifestRepositorySupport
 import com.advancedtelematic.util.ResourceSpec.ClientTObject
 import com.advancedtelematic.util.{DatabaseSpec, LongHttpRequest, LongTest, ResourceSpec, TreeHubSpec}
-import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport._
+import com.github.pjfanning.pekkohttpcirce.FailFastCirceSupport._
 import io.circe.Json
 import io.circe.syntax._
 
diff --git a/src/test/scala/com/advancedtelematic/treehub/http/ObjectResourceIntegrationSpec.scala b/src/test/scala/com/advancedtelematic/treehub/http/ObjectResourceIntegrationSpec.scala
index 342f29ea..0bf68215 100644
--- a/src/test/scala/com/advancedtelematic/treehub/http/ObjectResourceIntegrationSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/http/ObjectResourceIntegrationSpec.scala
@@ -1,17 +1,18 @@
 package com.advancedtelematic.treehub.http
 
-import akka.actor.Props
-import akka.http.scaladsl.model.*
-import akka.http.scaladsl.model.headers.Location
-import akka.http.scaladsl.server.Directives
-import akka.http.scaladsl.testkit.ScalatestRouteTest
-import akka.util.ByteString
+import org.apache.pekko.actor.Props
+import org.apache.pekko.http.scaladsl.model.*
+import org.apache.pekko.http.scaladsl.model.headers.Location
+import org.apache.pekko.http.scaladsl.server.Directives
+import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.libats.data.DataType
 import com.advancedtelematic.libats.http.{DefaultRejectionHandler, ErrorHandler}
 import com.advancedtelematic.util.LongTest
 import com.advancedtelematic.treehub.object_store.{ObjectStore, S3BlobStore}
 import com.advancedtelematic.util.ResourceSpec.ClientTObject
 import com.advancedtelematic.util.{DatabaseSpec, FakeUsageUpdate, TreeHubSpec}
+import org.apache.pekko.http.scaladsl.Http
 
 import java.nio.file.Paths
 
@@ -58,7 +59,7 @@ class ObjectResourceIntegrationSpec extends TreeHubSpec with ScalatestRouteTest
 
     val entity = HttpEntity.Strict(ContentTypes.`application/octet-stream`, ByteString(obj.blob))
     val req = HttpRequest(HttpMethods.PUT, url, entity = entity)
-    val awsResponse = akka.http.scaladsl.Http().singleRequest(req).futureValue
+    val awsResponse = Http().singleRequest(req).futureValue
     awsResponse.status shouldBe StatusCodes.OK
 
     Get(s"/objects/${obj.prefixedObjectId}") ~> routes ~> check {
diff --git a/src/test/scala/com/advancedtelematic/treehub/http/ObjectResourceSpec.scala b/src/test/scala/com/advancedtelematic/treehub/http/ObjectResourceSpec.scala
index 9cccc844..10b5152f 100644
--- a/src/test/scala/com/advancedtelematic/treehub/http/ObjectResourceSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/http/ObjectResourceSpec.scala
@@ -4,10 +4,10 @@
   */
 package com.advancedtelematic.treehub.http
 
-import akka.http.scaladsl.model.*
-import akka.http.scaladsl.model.headers.RawHeader
-import akka.http.scaladsl.unmarshalling.PredefinedFromEntityUnmarshallers.byteArrayUnmarshaller
-import akka.pattern.ask
+import org.apache.pekko.http.scaladsl.model.*
+import org.apache.pekko.http.scaladsl.model.headers.RawHeader
+import org.apache.pekko.http.scaladsl.unmarshalling.PredefinedFromEntityUnmarshallers.byteArrayUnmarshaller
+import org.apache.pekko.pattern.ask
 import com.advancedtelematic.treehub.db.ObjectRepositorySupport
 import com.advancedtelematic.util.FakeUsageUpdate.{CurrentBandwith, CurrentStorage}
 import com.advancedtelematic.util.ResourceSpec.ClientTObject
diff --git a/src/test/scala/com/advancedtelematic/treehub/http/RefResourceIntegrationSpec.scala b/src/test/scala/com/advancedtelematic/treehub/http/RefResourceIntegrationSpec.scala
index 5b0bdaa7..d3f97cf8 100644
--- a/src/test/scala/com/advancedtelematic/treehub/http/RefResourceIntegrationSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/http/RefResourceIntegrationSpec.scala
@@ -2,9 +2,9 @@ package com.advancedtelematic.treehub.http
 
 import java.io.File
 
-import akka.http.scaladsl.model.StatusCodes
-import akka.http.scaladsl.model.headers.RawHeader
-import akka.stream.scaladsl.FileIO
+import org.apache.pekko.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.model.headers.RawHeader
+import org.apache.pekko.stream.scaladsl.FileIO
 import com.advancedtelematic.data.DataType.{Commit, ObjectId, ObjectStatus, Ref, RefName, TObject}
 import com.advancedtelematic.libats.messaging_datatype.DataType.Commit
 import com.advancedtelematic.treehub.db.{ObjectRepositorySupport, RefRepositorySupport}
diff --git a/src/test/scala/com/advancedtelematic/treehub/http/RefResourceSpec.scala b/src/test/scala/com/advancedtelematic/treehub/http/RefResourceSpec.scala
index dd11b54a..b0c23128 100644
--- a/src/test/scala/com/advancedtelematic/treehub/http/RefResourceSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/http/RefResourceSpec.scala
@@ -1,7 +1,7 @@
 package com.advancedtelematic.treehub.http
 
-import akka.http.scaladsl.marshalling.{Marshaller, ToEntityMarshaller}
-import akka.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.marshalling.{Marshaller, ToEntityMarshaller}
+import org.apache.pekko.http.scaladsl.model.StatusCodes
 import com.advancedtelematic.common.DigestCalculator
 import com.advancedtelematic.treehub.db.RefRepositorySupport
 import com.advancedtelematic.util.ResourceSpec.ClientTObject
diff --git a/src/test/scala/com/advancedtelematic/treehub/http/TreehubRoutesSpec.scala b/src/test/scala/com/advancedtelematic/treehub/http/TreehubRoutesSpec.scala
index 8ba6403a..d4b2fd36 100644
--- a/src/test/scala/com/advancedtelematic/treehub/http/TreehubRoutesSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/http/TreehubRoutesSpec.scala
@@ -1,11 +1,11 @@
 package com.advancedtelematic.treehub.http
 
-import akka.Done
-import akka.http.scaladsl.model.{HttpResponse, StatusCodes}
-import akka.http.scaladsl.server.Directives
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.Done
+import org.apache.pekko.http.scaladsl.model.{HttpResponse, StatusCodes}
+import org.apache.pekko.http.scaladsl.server.Directives
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.data.DataType.ObjectId
 import com.advancedtelematic.libats.data.DataType
 import com.advancedtelematic.treehub.object_store.{BlobStore, ObjectStore}
diff --git a/src/test/scala/com/advancedtelematic/treehub/object_store/ObjectStoreSpec.scala b/src/test/scala/com/advancedtelematic/treehub/object_store/ObjectStoreSpec.scala
index 2dd85cb1..b357eea3 100644
--- a/src/test/scala/com/advancedtelematic/treehub/object_store/ObjectStoreSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/object_store/ObjectStoreSpec.scala
@@ -1,8 +1,8 @@
 package com.advancedtelematic.treehub.object_store
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.data.DataType.{ObjectId, ObjectStatus, TObject}
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.treehub.db.ObjectRepositorySupport
@@ -19,7 +19,7 @@ class ObjectStoreSpec extends TreeHubSpec with DatabaseSpec with ObjectRepositor
   implicit val ec: ExecutionContextExecutor = ExecutionContext.global
   implicit val system: ActorSystem = ActorSystem("ObjectStoreSpecSystem")
 
-  override implicit def patienceConfig = PatienceConfig().copy(timeout = Span(3, Seconds))
+  override implicit def patienceConfig: PatienceConfig = PatienceConfig().copy(timeout = Span(3, Seconds))
 
   val localStorageDir = Files.createTempDirectory("treehub")
 
diff --git a/src/test/scala/com/advancedtelematic/treehub/object_store/S3BlobStoreIntegrationSpec.scala b/src/test/scala/com/advancedtelematic/treehub/object_store/S3BlobStoreIntegrationSpec.scala
index 73822663..a7cd9b48 100644
--- a/src/test/scala/com/advancedtelematic/treehub/object_store/S3BlobStoreIntegrationSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/object_store/S3BlobStoreIntegrationSpec.scala
@@ -1,10 +1,10 @@
 package com.advancedtelematic.treehub.object_store
 
-import akka.Done
-import akka.actor.ActorSystem
-import akka.http.scaladsl.model.StatusCodes
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.Done
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.model.StatusCodes
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.data.DataType.{ObjectId, ObjectIdOps, ObjectStatus, TObject}
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.util.ResourceSpec.ClientTObject
@@ -25,7 +25,7 @@ class S3BlobStoreIntegrationSpec extends TreeHubSpec {
 
   val s3BlobStore = S3BlobStore(s3Credentials, allowRedirects = false, root = Some(Paths.get("test-objects")))
 
-  override implicit def patienceConfig = PatienceConfig().copy(timeout = Span(15, Seconds))
+  override implicit def patienceConfig: PatienceConfig = PatienceConfig().copy(timeout = Span(15, Seconds))
 
   test("can construct custom")  {
     val creds = new S3Credentials("", "", "", Regions.fromName("eu-central-1"), "https://storage.googleapis.com")
diff --git a/src/test/scala/com/advancedtelematic/treehub/repo_metrics/BandwidthUpdateSpec.scala b/src/test/scala/com/advancedtelematic/treehub/repo_metrics/BandwidthUpdateSpec.scala
index 7d6a531a..7eda40cb 100644
--- a/src/test/scala/com/advancedtelematic/treehub/repo_metrics/BandwidthUpdateSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/repo_metrics/BandwidthUpdateSpec.scala
@@ -1,7 +1,7 @@
 package com.advancedtelematic.treehub.repo_metrics
 
 import cats.syntax.either._
-import akka.testkit.{TestActorRef, TestKitBase}
+import org.apache.pekko.testkit.{TestActorRef, TestKitBase}
 import com.advancedtelematic.data.DataType.ObjectId
 import com.advancedtelematic.libats.messaging_datatype.DataType.UpdateType
 import com.advancedtelematic.libats.messaging_datatype.Messages.BandwidthUsage
diff --git a/src/test/scala/com/advancedtelematic/treehub/repo_metrics/StorageUpdateSpec.scala b/src/test/scala/com/advancedtelematic/treehub/repo_metrics/StorageUpdateSpec.scala
index e68188e5..2c5c2833 100644
--- a/src/test/scala/com/advancedtelematic/treehub/repo_metrics/StorageUpdateSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/repo_metrics/StorageUpdateSpec.scala
@@ -1,6 +1,6 @@
 package com.advancedtelematic.treehub.repo_metrics
 
-import akka.testkit.TestActorRef
+import org.apache.pekko.testkit.TestActorRef
 import com.advancedtelematic.data.DataType.{ObjectId, ObjectStatus, TObject}
 import com.advancedtelematic.treehub.repo_metrics.UsageMetricsRouter.UpdateStorage
 import com.advancedtelematic.util.TreeHubSpec
diff --git a/src/test/scala/com/advancedtelematic/treehub/repo_metrics/UsageUpdateSpec.scala b/src/test/scala/com/advancedtelematic/treehub/repo_metrics/UsageUpdateSpec.scala
index 694565b8..c32e26ec 100644
--- a/src/test/scala/com/advancedtelematic/treehub/repo_metrics/UsageUpdateSpec.scala
+++ b/src/test/scala/com/advancedtelematic/treehub/repo_metrics/UsageUpdateSpec.scala
@@ -1,8 +1,8 @@
 package com.advancedtelematic.treehub.repo_metrics
 
 import java.nio.file.{Files, Paths}
-import akka.actor.ActorSystem
-import akka.testkit.TestKitBase
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.testkit.TestKitBase
 import com.advancedtelematic.libats.messaging.MessageBus
 import com.advancedtelematic.treehub.db.ObjectRepositorySupport
 import com.advancedtelematic.treehub.object_store.{LocalFsBlobStore, ObjectStore}
diff --git a/src/test/scala/com/advancedtelematic/util/DefaultPatience.scala b/src/test/scala/com/advancedtelematic/util/DefaultPatience.scala
index eaadab9c..093c0351 100644
--- a/src/test/scala/com/advancedtelematic/util/DefaultPatience.scala
+++ b/src/test/scala/com/advancedtelematic/util/DefaultPatience.scala
@@ -4,5 +4,5 @@ import org.scalatest.concurrent.PatienceConfiguration
 import org.scalatest.time.{Millis, Seconds, Span}
 
 trait DefaultPatience extends PatienceConfiguration {
-  override implicit def patienceConfig = PatienceConfig(timeout = Span(10, Seconds), interval = Span(500, Millis))
+  override implicit def patienceConfig: PatienceConfig = PatienceConfig(timeout = Span(10, Seconds), interval = Span(500, Millis))
 }
diff --git a/src/test/scala/com/advancedtelematic/util/LongTest.scala b/src/test/scala/com/advancedtelematic/util/LongTest.scala
index df1a07d5..fba59620 100644
--- a/src/test/scala/com/advancedtelematic/util/LongTest.scala
+++ b/src/test/scala/com/advancedtelematic/util/LongTest.scala
@@ -5,5 +5,5 @@ import org.scalatest.concurrent.PatienceConfiguration
 import org.scalatest.time.{Millis, Seconds, Span}
 
 trait LongTest extends PatienceConfiguration {
-  override implicit def patienceConfig = PatienceConfig(timeout = Span(10, Seconds), interval = Span(100, Millis))
+  override implicit def patienceConfig: PatienceConfig = PatienceConfig(timeout = Span(10, Seconds), interval = Span(100, Millis))
 }
diff --git a/src/test/scala/com/advancedtelematic/util/ResourceSpec.scala b/src/test/scala/com/advancedtelematic/util/ResourceSpec.scala
index 5fda880f..48c50915 100644
--- a/src/test/scala/com/advancedtelematic/util/ResourceSpec.scala
+++ b/src/test/scala/com/advancedtelematic/util/ResourceSpec.scala
@@ -1,12 +1,12 @@
 package com.advancedtelematic.util
 
-import akka.actor.{Actor, ActorLogging, ActorSystem, Props}
-import akka.http.scaladsl.model.Multipart.FormData.BodyPart
-import akka.http.scaladsl.model.{HttpEntity, MediaTypes, Multipart}
-import akka.http.scaladsl.testkit.{RouteTestTimeout, ScalatestRouteTest}
-import akka.stream.scaladsl.Source
-import akka.testkit.TestDuration
-import akka.util.ByteString
+import org.apache.pekko.actor.{Actor, ActorLogging, ActorSystem, Props}
+import org.apache.pekko.http.scaladsl.model.Multipart.FormData.BodyPart
+import org.apache.pekko.http.scaladsl.model.{HttpEntity, MediaTypes, Multipart}
+import org.apache.pekko.http.scaladsl.testkit.{RouteTestTimeout, ScalatestRouteTest}
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.testkit.TestDuration
+import org.apache.pekko.util.ByteString
 import com.advancedtelematic.common.DigestCalculator
 import com.advancedtelematic.data.DataType.ObjectId
 import com.advancedtelematic.libats.data.DataType.Namespace