diff --git a/build.sbt b/build.sbt
index 4f02f72..0c918be 100644
--- a/build.sbt
+++ b/build.sbt
@@ -10,7 +10,7 @@ ThisBuild / dynverSeparator := "-"
 
 lazy val `akka-projection-testing` = project
   .in(file("."))
-  .enablePlugins(JavaAppPackaging, DockerPlugin)
+  .enablePlugins(JavaAppPackaging, DockerPlugin, Insights)
   .settings(
     organization := "akka.projection.testing",
     scalaVersion := "2.13.15",
@@ -54,13 +54,7 @@ lazy val `akka-projection-testing` = project
       "com.typesafe.akka" %% "akka-stream-testkit" % AkkaVersion % Test,
       "com.lightbend.akka" %% "akka-projection-testkit" % AkkaProjectionVersion % Test,
       "org.scalatest" %% "scalatest" % "3.2.19" % Test,
-      "commons-io" % "commons-io" % "2.18.0" % Test
-//        Cinnamon.library.cinnamonPrometheus,
-//        Cinnamon.library.cinnamonPrometheusHttpServer,
-//        Cinnamon.library.cinnamonAkkaTyped,
-//        Cinnamon.library.cinnamonAkkaPersistence
-    ),
-//    cinnamon in run := true,
+      "commons-io" % "commons-io" % "2.18.0" % Test),
     run / fork := true,
     // pass along config selection to forked jvm
     run / javaOptions ++= sys.props
diff --git a/project/Insights.scala b/project/Insights.scala
new file mode 100644
index 0000000..4ed3bc1
--- /dev/null
+++ b/project/Insights.scala
@@ -0,0 +1,22 @@
+import sbt._
+import sbt.Keys._
+
+import com.lightbend.cinnamon.sbt.Cinnamon
+import com.lightbend.cinnamon.sbt.Cinnamon.CinnamonKeys._
+
+object Insights extends AutoPlugin {
+  val enabled = sys.props.getOrElse("insights.enabled", "false").toBoolean
+
+  override def requires = if (enabled) Cinnamon else plugins.JvmPlugin
+
+  override def projectSettings = if (enabled) cinnamonSettings else Seq.empty
+
+  def cinnamonSettings = Seq(
+    run / cinnamon := true,
+    libraryDependencies ++= Seq(
+      Cinnamon.library.cinnamonAkkaTyped,
+      Cinnamon.library.cinnamonAkkaPersistence,
+      Cinnamon.library.cinnamonAkkaProjection,
+      Cinnamon.library.cinnamonPrometheus,
+      Cinnamon.library.cinnamonPrometheusHttpServer))
+}
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 07e3de5..763acb4 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
-//addSbtPlugin("com.lightbend.cinnamon" % "sbt-cinnamon" % "2.21.2")
+addSbtPlugin("com.lightbend.cinnamon" % "sbt-cinnamon" % "2.21.2")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")