diff --git a/build.sbt b/build.sbt
index f792687..1526de5 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,7 +4,7 @@ import BuildInfo._
 import Release._
 import Docker._
 
-val kafkaVersion = "1.1.0"
+val kafkaVersion = "2.3.1"
 
 val kafkaDeps = Seq(
   "org.apache.kafka" % "kafka-clients",
@@ -13,10 +13,10 @@ val kafkaDeps = Seq(
 
 val dependencies = Seq(
   "com.github.scopt"           %% "scopt"               % "3.7.1",
-  "org.zalando"                %% "grafter"             % "1.6.0",
+  "org.zalando"                %% "grafter"             % "2.6.1",
   "com.typesafe.scala-logging" %% "scala-logging"       % "3.5.0",
-  "io.circe"                   %% "circe-yaml"          % "0.12.0",
-  "io.circe"                   %% "circe-generic"       % "0.12.3",
+  "io.circe"                   %% "circe-yaml"          % "0.13.1",
+  "io.circe"                   %% "circe-generic"       % "0.13.0",
   "org.typelevel"              %% "cats-core"           % "1.5.0",
   "org.typelevel"              %% "cats-kernel"         % "1.5.0",
   "org.slf4j"                   % "log4j-over-slf4j"    % "1.7.25",
@@ -29,7 +29,7 @@ val dependencies = Seq(
 ) ++ kafkaDeps
 
 val root = (project in file("."))
-  .enablePlugins(BuildInfoPlugin, JavaAppPackaging, UniversalDeployPlugin, DockerPlugin)
+  .enablePlugins(BuildInfoPlugin, JavaAppPackaging, UniversalDeployPlugin, DockerPlugin, AshScriptPlugin)
   .settings(
     defineCommandAliases,
     organization := "com.sky",
diff --git a/project/Docker.scala b/project/Docker.scala
index 7c8dda9..c9d7fa0 100644
--- a/project/Docker.scala
+++ b/project/Docker.scala
@@ -8,12 +8,12 @@ object Docker {
 
   lazy val dockerSettings = Seq(
     packageName in docker := packageName.value,
-    dockerBaseImage := "openjdk:8u131-jre-alpine",
+    dockerBaseImage := "alpine:3.13.0",
     dockerUpdateLatest := updateLatest.value,
     dockerRepository := Some("skyuk"),
     dockerCommands ++= Seq(
       Cmd("USER", "root"),
-      Cmd("RUN", "apk update && apk add bash")
+      Cmd("RUN", "apk add --no-cache openjdk11-jre")
     )
   )
 
diff --git a/src/main/scala/com/sky/kafka/configurator/Main.scala b/src/main/scala/com/sky/kafka/configurator/Main.scala
index f5f6569..5fb3612 100644
--- a/src/main/scala/com/sky/kafka/configurator/Main.scala
+++ b/src/main/scala/com/sky/kafka/configurator/Main.scala
@@ -33,7 +33,7 @@ object Main extends LazyLogging {
     }
 
   private def stop(app: KafkaConfiguratorApp): Unit =
-    Rewriter.stop(app).value.foreach {
+    Rewriter.stopAll(app).value.foreach {
       case StopOk(msg) => logger.debug(s"Component stopped: $msg")
       case StopError(msg, ex) => logger.warn(s"Error whilst stopping component: $msg", ex)
       case StopFailure(msg) => logger.warn(s"Failure whilst stopping component: $msg")