diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f286f44d..279c72d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,8 +21,12 @@ jobs:
         uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v14
+      - name: Setup Scala
+        uses: actions/setup-java@v3.13.0
+        with:
+          distribution: corretto
+          java-version: '17'
+          check-latest: true
       - name: Cache Scala dependencies
         uses: coursier/cache-action@v6
       - name: Lint code
@@ -34,8 +38,12 @@ jobs:
     steps:
       - name: Checkout current branch
         uses: actions/checkout@v3.3.0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v14
+      - name: Setup Scala
+        uses: actions/setup-java@v3.13.0
+        with:
+          distribution: corretto
+          java-version: '17'
+          check-latest: true
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Check Document Generation
@@ -47,18 +55,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: ['adopt@1.8', 'adopt@1.11']
-        scala: ['2.12.17', '2.13.10', '3.2.1']
+        java: ['11', '17', '21']
+        scala: ['2.12.18', '2.13.12', '3.3.1']
         platform: ['JVM']
     steps:
       - name: Checkout current branch
         uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v14
+      - name: Setup Scala
+        uses: actions/setup-java@v3.13.0
         with:
+          distribution: corretto
           java-version: ${{ matrix.java }}
+          check-latest: true
       - name: Cache Scala dependencies
         uses: coursier/cache-action@v6
       - name: Run tests
@@ -83,8 +93,12 @@ jobs:
         uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v14
+      - name: Setup Scala
+        uses: actions/setup-java@v3.13.0
+        with:
+          distribution: corretto
+          java-version: '17'
+          check-latest: true
       - name: Cache Scala dependencies
         uses: coursier/cache-action@v6
       - name: Release artifacts
diff --git a/build.sbt b/build.sbt
index 94805a82..74a211f1 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,8 +1,8 @@
 import BuildHelper._
 
-val ZioVersion       = "2.0.6"
+val ZioVersion       = "2.0.18"
 val H2Version        = "2.1.214"
-val ZioSchemaVersion = "0.4.8"
+val ZioSchemaVersion = "0.4.14"
 
 name := "zio-jdbc"
 
@@ -73,7 +73,7 @@ lazy val examples = project
   .settings(
     publish / skip := true,
     libraryDependencies ++= Seq(
-      "ch.qos.logback"       % "logback-classic"          % "1.4.6",
+      "ch.qos.logback"       % "logback-classic"          % "1.4.7",
       "net.logstash.logback" % "logstash-logback-encoder" % "7.3"
     )
   )
diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
index 18490554..974e1214 100644
--- a/project/BuildHelper.scala
+++ b/project/BuildHelper.scala
@@ -22,7 +22,7 @@ object BuildHelper {
 
   lazy val Scala212: String = versions("2.12")
   lazy val Scala213: String = versions("2.13")
-  lazy val Scala3: String   = versions("3.2")
+  lazy val Scala3: String   = versions("3.3")
 
   val SilencerVersion = "1.7.12"