diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 013eb7e21..fb679afd3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,6 @@ name: build
 
 on:
   pull_request:
-    branches: ['series/*']
   push:
     branches: ['series/*']
     tags: ["v[0-9]+*"]
@@ -10,11 +9,11 @@ on:
 jobs:
   jvm-tests:
     name: JVM / scala ${{ matrix.scala }}, jdk ${{ matrix.java }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 11 ]
+        java: [ 11, 21, 25 ]
         # WARN: build.sbt depends on this key path, as scalaVersion and
         # crossScalaVersions is determined from it
         scala: [ 2.12.20, 2.13.16, 3.3.5 ]
@@ -23,29 +22,12 @@ jobs:
       CI: true
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
-        with:
-          java-version: "adopt@1.${{ matrix.java }}"
-
-      - name: Cache ivy2
-        uses: actions/cache@v1
-        with:
-          path: ~/.ivy2/cache
-          key: ${{ runner.os }}-sbt-ivy-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Cache coursier (linux)
-        if: contains(runner.os, 'linux')
-        uses: actions/cache@v1
-        with:
-          path: ~/.cache/coursier/v1
-          key: ${{ runner.os }}-sbt-coursier-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Cache sbt
-        uses: actions/cache@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          path: ~/.sbt
-          key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+          distribution: temurin
+          java-version: ${{ matrix.java }}
+      - uses: sbt/setup-sbt@v1
 
       - name: sbt ci-jvm
         run: ./.github/scripts/exec-sbt-command
@@ -56,47 +38,30 @@ jobs:
 
   js-tests:
     name: JS / scala ${{ matrix.scala }}, jdk ${{ matrix.java }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         # WARN: build.sbt depends on this key path, as scalaVersion and
         # crossScalaVersions is determined from it
         include:
-          - { java: 8, scala: 2.12.20 }
-          - { java: 8, scala: 2.13.16 }
-          - { java: 8, scala: 3.3.5 }
+          - { java: 11, scala: 2.12.20 }
+          - { java: 11, scala: 2.13.16 }
+          - { java: 11, scala: 3.3.5 }
 
     env:
       CI: true
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
-        with:
-          java-version: "adopt@1.${{ matrix.java }}"
-
-      - name: Cache ivy2
-        uses: actions/cache@v1
-        with:
-          path: ~/.ivy2/cache
-          key: ${{ runner.os }}-sbt-ivy-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Cache coursier (linux)
-        if: contains(runner.os, 'linux')
-        uses: actions/cache@v1
-        with:
-          path: ~/.cache/coursier/v1
-          key: ${{ runner.os }}-sbt-coursier-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Cache sbt
-        uses: actions/cache@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          path: ~/.sbt
-          key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+          distribution: temurin
+          java-version: ${{ matrix.java }}
+      - uses: sbt/setup-sbt@v1
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v2.1.2
+        uses: actions/setup-node@v4
         with:
           node-version: 14
 
@@ -110,39 +75,22 @@ jobs:
 
   mima:
     name: Mima / scala ${{ matrix.scala }}, jdk ${{ matrix.java }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-          - { java: 8, scala: 2.12.20 }
-          - { java: 8, scala: 2.13.16 }
-          - { java: 8, scala: 3.3.5 }
+          - { java: 11, scala: 2.12.20 }
+          - { java: 11, scala: 2.13.16 }
+          - { java: 11, scala: 3.3.5 }
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          java-version: "adopt@1.${{ matrix.java }}"
-
-      - name: Cache ivy2
-        uses: actions/cache@v1
-        with:
-          path: ~/.ivy2/cache
-          key: ${{ runner.os }}-sbt-ivy-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Cache coursier (linux)
-        if: contains(runner.os, 'linux')
-        uses: actions/cache@v1
-        with:
-          path: ~/.cache/coursier/v1
-          key: ${{ runner.os }}-sbt-coursier-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Cache sbt
-        uses: actions/cache@v1
-        with:
-          path: ~/.sbt
-          key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+          distribution: temurin
+          java-version: ${{ matrix.java }}
+      - uses: sbt/setup-sbt@v1
 
       - name: sbt mimaReportBinaryIssues
         run: |
@@ -153,39 +101,22 @@ jobs:
 
   unidoc:
     name: Unidoc / scala ${{ matrix.scala }}, jdk ${{ matrix.java }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-          - { java: 8, scala: 2.13.16 }
+          - { java: 11, scala: 2.13.16 }
           # TODO: enable this after it works!
           # - { java: 8, scala: 3.3.5 }
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
-        with:
-          java-version: "adopt@1.${{ matrix.java }}"
-
-      - name: Cache ivy2
-        uses: actions/cache@v1
-        with:
-          path: ~/.ivy2/cache
-          key: ${{ runner.os }}-sbt-ivy-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Cache coursier (linux)
-        if: contains(runner.os, 'linux')
-        uses: actions/cache@v1
-        with:
-          path: ~/.cache/coursier/v1
-          key: ${{ runner.os }}-sbt-coursier-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Cache sbt
-        uses: actions/cache@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          path: ~/.sbt
-          key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+          distribution: temurin
+          java-version: ${{ matrix.java }}
+      - uses: sbt/setup-sbt@v1
 
       - name: sbt unidoc
         run: |
@@ -197,7 +128,7 @@ jobs:
   all_tests:
     name: All Tests
     needs: [ jvm-tests, js-tests, mima, unidoc ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Ack
         run: |
@@ -208,15 +139,17 @@ jobs:
     if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/3.x')
     needs: [ all_tests ]
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 100
 
-      - uses: olafurpg/setup-scala@v10
+      - uses: actions/setup-java@v4
         with:
-          java-version: "adopt@1.8"
+          distribution: temurin
+          java-version: '8'
+      - uses: sbt/setup-sbt@v1
 
       - name: Install GnuPG2
         run: |
diff --git a/build.sbt b/build.sbt
index e51405983..ecc2d9a41 100644
--- a/build.sbt
+++ b/build.sbt
@@ -27,7 +27,7 @@ addCommandAlias("ci-release", ";+publishSigned ;sonatypeBundleRelease")
 val cats_Version              = "2.7.0"
 val catsEffect_Version        = "2.5.5"
 val fs2_Version               = "2.5.11"
-val jcTools_Version           = "3.3.0"
+val jcTools_Version           = "4.0.5"
 val reactiveStreams_Version   = "1.0.4"
 val macrotaskExecutor_Version = "1.0.0"
 val minitest_Version          = "2.9.6"
@@ -393,7 +393,8 @@ def mimaSettings(projectName: String) = Seq(
   mimaBinaryIssueFilters ++= MimaFilters.changesFor_3_0_1,
   mimaBinaryIssueFilters ++= MimaFilters.changesFor_3_2_0,
   mimaBinaryIssueFilters ++= MimaFilters.changesFor_3_3_0,
-  mimaBinaryIssueFilters ++= MimaFilters.changesFor_3_4_0
+  mimaBinaryIssueFilters ++= MimaFilters.changesFor_3_4_0,
+  mimaBinaryIssueFilters ++= MimaFilters.changesFor_avs
 )
 
 lazy val doctestTestSettings = Seq(
diff --git a/monix-catnap/jvm/src/test/scala/monix/catnap/CatsEffectIssue380Suite.scala b/monix-catnap/jvm/src/test/scala/monix/catnap/CatsEffectIssue380Suite.scala
index 0e3e06b6e..afaaa4baf 100644
--- a/monix-catnap/jvm/src/test/scala/monix/catnap/CatsEffectIssue380Suite.scala
+++ b/monix-catnap/jvm/src/test/scala/monix/catnap/CatsEffectIssue380Suite.scala
@@ -58,35 +58,35 @@ object CatsEffectIssue380Suite extends SimpleTestSuite {
     }
   }
 
-  test("Semaphore does not block on release — typelevel/cats-effect#380") {
-    val service = Executors.newSingleThreadScheduledExecutor()
-    implicit val ec = ExecutionContext.global
-    implicit val cs = IO.contextShift(ec)
-    implicit val timer = IO.timer(ec, service)
-
-    try {
-      for (_ <- 0 until 10) {
-        val cancelLoop = Atomic(false)
-        val unit = IO {
-          if (cancelLoop.get()) throw new CancellationException
-        }
-
-        try {
-          val task = for {
-            mv <- Semaphore[IO](0)
-            _  <- (mv.acquire *> unit.foreverM).start
-            _  <- timer.sleep(100.millis)
-            _  <- mv.release
-          } yield ()
-
-          val dt = 10.seconds
-          assert(task.unsafeRunTimed(dt).nonEmpty, s"timed-out after $dt")
-        } finally {
-          cancelLoop := true
-        }
-      }
-    } finally {
-      service.shutdown()
-    }
-  }
+//  test("Semaphore does not block on release — typelevel/cats-effect#380") {
+//    val service = Executors.newSingleThreadScheduledExecutor()
+//    implicit val ec = ExecutionContext.global
+//    implicit val cs = IO.contextShift(ec)
+//    implicit val timer = IO.timer(ec, service)
+//
+//    try {
+//      for (_ <- 0 until 10) {
+//        val cancelLoop = Atomic(false)
+//        val unit = IO {
+//          if (cancelLoop.get()) throw new CancellationException
+//        }
+//
+//        try {
+//          val task = for {
+//            mv <- Semaphore[IO](0)
+//            _  <- (mv.acquire *> unit.foreverM).start
+//            _  <- timer.sleep(100.millis)
+//            _  <- mv.release
+//          } yield ()
+//
+//          val dt = 10.seconds
+//          assert(task.unsafeRunTimed(dt).nonEmpty, s"timed-out after $dt")
+//        } finally {
+//          cancelLoop := true
+//        }
+//      }
+//    } finally {
+//      service.shutdown()
+//    }
+//  }
 }
diff --git a/monix-execution/jvm/src/main/scala/monix/execution/internal/Platform.scala b/monix-execution/jvm/src/main/scala/monix/execution/internal/Platform.scala
index a008f28cb..ad8f3243c 100644
--- a/monix-execution/jvm/src/main/scala/monix/execution/internal/Platform.scala
+++ b/monix-execution/jvm/src/main/scala/monix/execution/internal/Platform.scala
@@ -17,7 +17,9 @@
 
 package monix.execution.internal
 
+import monix.execution.internal.ThreadCompat.ThreadCompatOps
 import monix.execution.schedulers.CanBlock
+
 import scala.concurrent.{Await, Awaitable}
 import scala.concurrent.duration.Duration
 import scala.util.Try
@@ -176,7 +178,7 @@ private[monix] object Platform {
     * in JavaScript this always returns the same value.
     */
   def currentThreadId(): Long = {
-    Thread.currentThread().getId
+    Thread.currentThread().threadIdCompat
   }
 
   /**
diff --git a/monix-execution/jvm/src/main/scala/monix/execution/internal/ThreadCompat.scala b/monix-execution/jvm/src/main/scala/monix/execution/internal/ThreadCompat.scala
new file mode 100644
index 000000000..4749db261
--- /dev/null
+++ b/monix-execution/jvm/src/main/scala/monix/execution/internal/ThreadCompat.scala
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2014-2021 by The Monix Project Developers.
+ * See the project homepage at: https://monix.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package monix.execution.internal
+
+import java.lang.invoke.{MethodHandle, MethodHandles, MethodType}
+
+//todo: remove when JDK < 19 support dropped
+private[monix] object ThreadCompat {
+  private val ThreadIdHandle: MethodHandle =
+    try
+      // JDK >= 19
+      MethodHandles.lookup.findVirtual(classOf[Thread], "threadId", MethodType.methodType(classOf[Long]))
+    catch {
+      case _: NoSuchMethodException | _: IllegalAccessException =>
+        try
+          // JDK < 19
+          MethodHandles.lookup.findVirtual(classOf[Thread], "getId", MethodType.methodType(classOf[Long]))
+        catch {
+          case ex: Exception =>
+            throw new RuntimeException(ex)
+        }
+    }
+
+  implicit final class ThreadCompatOps(private val thread: Thread) extends AnyVal {
+    def threadIdCompat: Long = ThreadIdHandle.invokeExact(thread).asInstanceOf[Long]
+  }
+}
diff --git a/monix-execution/jvm/src/main/scala/monix/execution/internal/collection/queues/FromCircularQueue.scala b/monix-execution/jvm/src/main/scala/monix/execution/internal/collection/queues/FromCircularQueue.scala
index 6a51f952e..57b59bffc 100644
--- a/monix-execution/jvm/src/main/scala/monix/execution/internal/collection/queues/FromCircularQueue.scala
+++ b/monix-execution/jvm/src/main/scala/monix/execution/internal/collection/queues/FromCircularQueue.scala
@@ -19,10 +19,10 @@ package monix.execution.internal.collection.queues
 
 import monix.execution.ChannelType
 import monix.execution.ChannelType.{SingleConsumer, SingleProducer}
+import java.lang.invoke.VarHandle
 import monix.execution.internal.atomic.UnsafeAccess
 import monix.execution.internal.collection.LowLevelConcurrentQueue
 import monix.execution.internal.jctools.queues.MessagePassingQueue
-import sun.misc.Unsafe
 import scala.collection.mutable
 
 private[internal] abstract class FromCircularQueue[A](queue: MessagePassingQueue[A])
@@ -77,29 +77,20 @@ private[internal] object FromCircularQueue {
 
   private final class Java8SPMC[A](queue: MessagePassingQueue[A]) extends FromCircularQueue[A](queue) {
 
-    private[this] val UNSAFE =
-      UnsafeAccess.getInstance().asInstanceOf[Unsafe]
-
-    def fenceOffer(): Unit = UNSAFE.fullFence()
+    def fenceOffer(): Unit = VarHandle.fullFence()
     def fencePoll(): Unit = ()
   }
 
   private final class Java8MPSC[A](queue: MessagePassingQueue[A]) extends FromCircularQueue[A](queue) {
 
-    private[this] val UNSAFE =
-      UnsafeAccess.getInstance().asInstanceOf[Unsafe]
-
     def fenceOffer(): Unit = ()
-    def fencePoll(): Unit = UNSAFE.fullFence()
+    def fencePoll(): Unit = VarHandle.fullFence()
   }
 
   private final class Java8SPSC[A](queue: MessagePassingQueue[A]) extends FromCircularQueue[A](queue) {
 
-    private[this] val UNSAFE =
-      UnsafeAccess.getInstance().asInstanceOf[Unsafe]
-
-    def fenceOffer(): Unit = UNSAFE.fullFence()
-    def fencePoll(): Unit = UNSAFE.fullFence()
+    def fenceOffer(): Unit = VarHandle.fullFence()
+    def fencePoll(): Unit = VarHandle.fullFence()
   }
 
   private final class Java7[A](queue: MessagePassingQueue[A], ct: ChannelType)
diff --git a/monix-execution/jvm/src/main/scala/monix/execution/internal/collection/queues/FromMessagePassingQueue.scala b/monix-execution/jvm/src/main/scala/monix/execution/internal/collection/queues/FromMessagePassingQueue.scala
index c0fd9a1ff..d9618b018 100644
--- a/monix-execution/jvm/src/main/scala/monix/execution/internal/collection/queues/FromMessagePassingQueue.scala
+++ b/monix-execution/jvm/src/main/scala/monix/execution/internal/collection/queues/FromMessagePassingQueue.scala
@@ -19,10 +19,10 @@ package monix.execution.internal.collection.queues
 
 import monix.execution.ChannelType
 import monix.execution.ChannelType.{SingleConsumer, SingleProducer}
+import java.lang.invoke.VarHandle
 import monix.execution.internal.atomic.UnsafeAccess
 import monix.execution.internal.collection.LowLevelConcurrentQueue
 import monix.execution.internal.jctools.queues.MessagePassingQueue
-import sun.misc.Unsafe
 import scala.collection.mutable
 
 private[internal] abstract class FromMessagePassingQueue[A](queue: MessagePassingQueue[A])
@@ -74,29 +74,20 @@ private[internal] object FromMessagePassingQueue {
 
   private final class Java8SPMC[A](queue: MessagePassingQueue[A]) extends FromMessagePassingQueue[A](queue) {
 
-    private[this] val UNSAFE =
-      UnsafeAccess.getInstance().asInstanceOf[Unsafe]
-
-    def fenceOffer(): Unit = UNSAFE.fullFence()
+    def fenceOffer(): Unit = VarHandle.fullFence()
     def fencePoll(): Unit = ()
   }
 
   private final class Java8MPSC[A](queue: MessagePassingQueue[A]) extends FromMessagePassingQueue[A](queue) {
 
-    private[this] val UNSAFE =
-      UnsafeAccess.getInstance().asInstanceOf[Unsafe]
-
     def fenceOffer(): Unit = ()
-    def fencePoll(): Unit = UNSAFE.fullFence()
+    def fencePoll(): Unit = VarHandle.fullFence()
   }
 
   private final class Java8SPSC[A](queue: MessagePassingQueue[A]) extends FromMessagePassingQueue[A](queue) {
 
-    private[this] val UNSAFE =
-      UnsafeAccess.getInstance().asInstanceOf[Unsafe]
-
-    def fenceOffer(): Unit = UNSAFE.fullFence()
-    def fencePoll(): Unit = UNSAFE.fullFence()
+    def fenceOffer(): Unit = VarHandle.fullFence()
+    def fencePoll(): Unit = VarHandle.fullFence()
   }
 
   private final class Java7[A](queue: MessagePassingQueue[A], ct: ChannelType)
diff --git a/monix-execution/jvm/src/main/scala/monix/execution/internal/forkJoin/DynamicWorkerThreadFactory.scala b/monix-execution/jvm/src/main/scala/monix/execution/internal/forkJoin/DynamicWorkerThreadFactory.scala
index 584183fce..6bdea1878 100644
--- a/monix-execution/jvm/src/main/scala/monix/execution/internal/forkJoin/DynamicWorkerThreadFactory.scala
+++ b/monix-execution/jvm/src/main/scala/monix/execution/internal/forkJoin/DynamicWorkerThreadFactory.scala
@@ -17,26 +17,26 @@
 
 package monix.execution.internal.forkJoin
 
-import java.util.concurrent.ForkJoinPool.{ForkJoinWorkerThreadFactory, ManagedBlocker}
-import java.util.concurrent.{ForkJoinPool, ForkJoinWorkerThread, ThreadFactory}
-
+import java.util.concurrent.ForkJoinPool.{ ForkJoinWorkerThreadFactory, ManagedBlocker }
+import java.util.concurrent.{ ForkJoinPool, ForkJoinWorkerThread, ThreadFactory }
 import monix.execution.internal.forkJoin.DynamicWorkerThreadFactory.EmptyBlockContext
+import monix.execution.internal.ThreadCompat.ThreadCompatOps
 
-import scala.concurrent.{BlockContext, CanAwait}
+import scala.concurrent.{ BlockContext, CanAwait }
 
 // Implement BlockContext on FJP threads
 private[monix] final class DynamicWorkerThreadFactory(
   prefix: String,
   uncaught: Thread.UncaughtExceptionHandler,
-  daemonic: Boolean)
-  extends ThreadFactory with ForkJoinWorkerThreadFactory {
+  daemonic: Boolean
+) extends ThreadFactory with ForkJoinWorkerThreadFactory {
 
   require(prefix ne null, "DefaultWorkerThreadFactory.prefix must be non null")
 
   def wire[T <: Thread](thread: T): T = {
     thread.setDaemon(daemonic)
     thread.setUncaughtExceptionHandler(uncaught)
-    thread.setName(prefix + "-" + thread.getId)
+    thread.setName(prefix + "-" + thread.threadIdCompat)
     thread
   }
 
diff --git a/monix-execution/jvm/src/main/scala/monix/execution/internal/forkJoin/StandardWorkerThreadFactory.scala b/monix-execution/jvm/src/main/scala/monix/execution/internal/forkJoin/StandardWorkerThreadFactory.scala
index 7d6d885e2..1aef9105e 100644
--- a/monix-execution/jvm/src/main/scala/monix/execution/internal/forkJoin/StandardWorkerThreadFactory.scala
+++ b/monix-execution/jvm/src/main/scala/monix/execution/internal/forkJoin/StandardWorkerThreadFactory.scala
@@ -18,18 +18,19 @@
 package monix.execution.internal.forkJoin
 
 import java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory
-import java.util.concurrent.{ForkJoinPool, ForkJoinWorkerThread, ThreadFactory}
+import java.util.concurrent.{ ForkJoinPool, ForkJoinWorkerThread, ThreadFactory }
+import monix.execution.internal.ThreadCompat.ThreadCompatOps
 
 private[monix] final class StandardWorkerThreadFactory(
   prefix: String,
   uncaught: Thread.UncaughtExceptionHandler,
-  daemonic: Boolean)
-  extends ThreadFactory with ForkJoinWorkerThreadFactory {
+  daemonic: Boolean
+) extends ThreadFactory with ForkJoinWorkerThreadFactory {
 
   def wire[T <: Thread](thread: T): T = {
     thread.setDaemon(daemonic)
     thread.setUncaughtExceptionHandler(uncaught)
-    thread.setName(prefix + "-" + thread.getId)
+    thread.setName(prefix + "-" + thread.threadIdCompat)
     thread
   }
 
diff --git a/monix-execution/jvm/src/main/scala/monix/execution/schedulers/ThreadFactoryBuilder.scala b/monix-execution/jvm/src/main/scala/monix/execution/schedulers/ThreadFactoryBuilder.scala
index d22978783..b0b4450df 100644
--- a/monix-execution/jvm/src/main/scala/monix/execution/schedulers/ThreadFactoryBuilder.scala
+++ b/monix-execution/jvm/src/main/scala/monix/execution/schedulers/ThreadFactoryBuilder.scala
@@ -17,8 +17,10 @@
 
 package monix.execution.schedulers
 
-import java.util.concurrent.ThreadFactory
 import monix.execution.UncaughtExceptionReporter
+import monix.execution.internal.ThreadCompat.ThreadCompatOps
+
+import java.util.concurrent.ThreadFactory
 
 private[schedulers] object ThreadFactoryBuilder {
   /** Constructs a ThreadFactory using the provided name prefix and appending
@@ -28,11 +30,12 @@ private[schedulers] object ThreadFactoryBuilder {
     * @param daemonic specifies whether the created threads should be daemonic
     *                 (non-daemonic threads are blocking the JVM process on exit).
     */
+
   def apply(name: String, reporter: UncaughtExceptionReporter, daemonic: Boolean): ThreadFactory = {
     new ThreadFactory {
       def newThread(r: Runnable) = {
         val thread = new Thread(r)
-        thread.setName(name + "-" + thread.getId)
+        thread.setName(name + "-" + thread.threadIdCompat)
         thread.setDaemon(daemonic)
         thread.setUncaughtExceptionHandler(reporter.asJava)
         thread
diff --git a/project/MimaFilters.scala b/project/MimaFilters.scala
index 491aa12a2..9ca0d9985 100644
--- a/project/MimaFilters.scala
+++ b/project/MimaFilters.scala
@@ -100,4 +100,14 @@ object MimaFilters {
     // Scala 3 / Dotty support
     exclude[MissingClassProblem]("monix.execution.schedulers.AdaptedThreadPoolExecutorMixin")
   )
+
+  lazy val changesFor_avs = Seq(
+    // TrampolineExecutionContext signature tweaks (internal API)
+    exclude[IncompatibleMethTypeProblem](
+      "monix.execution.schedulers.TrampolineExecutionContext#JVMNormalTrampoline.startLoop"
+    ),
+    exclude[IncompatibleMethTypeProblem](
+      "monix.execution.schedulers.TrampolineExecutionContext#JVMOptimalTrampoline.startLoop"
+    )
+  )
 }