diff --git a/build.sbt b/build.sbt
index fbe95e66..199f3f53 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,4 @@
-val monixVersion = "2.3.3"
+val monixVersion = "3.0.0-M3"
 
 addCommandAlias("ci",      ";+clean ;+test:compile ;+doc")
 addCommandAlias("release", ";+clean ;+package ;+publishSigned ;sonatypeReleaseAll")
diff --git a/kafka-0.10.x/src/main/scala/monix/kafka/KafkaProducer.scala b/kafka-0.10.x/src/main/scala/monix/kafka/KafkaProducer.scala
index 12582948..846986ad 100644
--- a/kafka-0.10.x/src/main/scala/monix/kafka/KafkaProducer.scala
+++ b/kafka-0.10.x/src/main/scala/monix/kafka/KafkaProducer.scala
@@ -19,7 +19,7 @@ package monix.kafka
 import com.typesafe.scalalogging.StrictLogging
 import monix.eval.Task
 import monix.execution.atomic.Atomic
-import monix.execution.cancelables.SingleAssignmentCancelable
+import monix.execution.cancelables.SingleAssignCancelable
 import monix.execution.{Cancelable, Scheduler}
 import org.apache.kafka.clients.producer.{Callback, ProducerRecord, RecordMetadata, KafkaProducer => ApacheKafkaProducer}
 
@@ -75,7 +75,7 @@ object KafkaProducer {
           }
           else {
             val isActive = Atomic(true)
-            val cancelable = SingleAssignmentCancelable()
+            val cancelable = SingleAssignCancelable()
             context.connection.push(cancelable)
 
             try {
diff --git a/kafka-0.11.x/src/main/scala/monix/kafka/KafkaProducer.scala b/kafka-0.11.x/src/main/scala/monix/kafka/KafkaProducer.scala
index 12582948..846986ad 100644
--- a/kafka-0.11.x/src/main/scala/monix/kafka/KafkaProducer.scala
+++ b/kafka-0.11.x/src/main/scala/monix/kafka/KafkaProducer.scala
@@ -19,7 +19,7 @@ package monix.kafka
 import com.typesafe.scalalogging.StrictLogging
 import monix.eval.Task
 import monix.execution.atomic.Atomic
-import monix.execution.cancelables.SingleAssignmentCancelable
+import monix.execution.cancelables.SingleAssignCancelable
 import monix.execution.{Cancelable, Scheduler}
 import org.apache.kafka.clients.producer.{Callback, ProducerRecord, RecordMetadata, KafkaProducer => ApacheKafkaProducer}
 
@@ -75,7 +75,7 @@ object KafkaProducer {
           }
           else {
             val isActive = Atomic(true)
-            val cancelable = SingleAssignmentCancelable()
+            val cancelable = SingleAssignCancelable()
             context.connection.push(cancelable)
 
             try {
diff --git a/kafka-0.9.x/src/main/scala/monix/kafka/KafkaProducer.scala b/kafka-0.9.x/src/main/scala/monix/kafka/KafkaProducer.scala
index 4a852ba7..3347daf3 100644
--- a/kafka-0.9.x/src/main/scala/monix/kafka/KafkaProducer.scala
+++ b/kafka-0.9.x/src/main/scala/monix/kafka/KafkaProducer.scala
@@ -19,7 +19,7 @@ package monix.kafka
 import com.typesafe.scalalogging.StrictLogging
 import monix.eval.Task
 import monix.execution.atomic.Atomic
-import monix.execution.cancelables.SingleAssignmentCancelable
+import monix.execution.cancelables.SingleAssignCancelable
 import monix.execution.{Cancelable, Scheduler}
 import org.apache.kafka.clients.producer.{Callback, ProducerRecord, RecordMetadata, KafkaProducer => ApacheKafkaProducer}
 
@@ -74,7 +74,7 @@ object KafkaProducer {
           }
           else {
             val isActive = Atomic(true)
-            val cancelable = SingleAssignmentCancelable()
+            val cancelable = SingleAssignCancelable()
             context.connection.push(cancelable)
 
             try {
diff --git a/kafka-1.0.x/src/main/scala/monix/kafka/KafkaProducer.scala b/kafka-1.0.x/src/main/scala/monix/kafka/KafkaProducer.scala
index 12582948..846986ad 100644
--- a/kafka-1.0.x/src/main/scala/monix/kafka/KafkaProducer.scala
+++ b/kafka-1.0.x/src/main/scala/monix/kafka/KafkaProducer.scala
@@ -19,7 +19,7 @@ package monix.kafka
 import com.typesafe.scalalogging.StrictLogging
 import monix.eval.Task
 import monix.execution.atomic.Atomic
-import monix.execution.cancelables.SingleAssignmentCancelable
+import monix.execution.cancelables.SingleAssignCancelable
 import monix.execution.{Cancelable, Scheduler}
 import org.apache.kafka.clients.producer.{Callback, ProducerRecord, RecordMetadata, KafkaProducer => ApacheKafkaProducer}
 
@@ -75,7 +75,7 @@ object KafkaProducer {
           }
           else {
             val isActive = Atomic(true)
-            val cancelable = SingleAssignmentCancelable()
+            val cancelable = SingleAssignCancelable()
             context.connection.push(cancelable)
 
             try {