diff --git a/build.sbt b/build.sbt
index 97c28177f07..2c681f4bdb2 100644
--- a/build.sbt
+++ b/build.sbt
@@ -284,7 +284,8 @@ lazy val commonDockerSettings = {
       val latestBranch = Some(currentBranch + "-latest")
 
       List(dockerVersion, updateLatest, latestBranch, dockerTagName)
-        .map(tag => alias.withTag(tag.map(sanitize)))
+        .flatten
+        .map(tag => alias.withTag(Some(sanitize(tag))))
         .distinct
     }
   )
diff --git a/project/plugins.sbt b/project/plugins.sbt
index fca5ce925f4..3bdcac898b8 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -12,7 +12,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.1")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.2")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.5.2")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.1")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")