diff --git a/docker.sbt b/docker.sbt
index f0e774065e..a4d1ca309a 100644
--- a/docker.sbt
+++ b/docker.sbt
@@ -4,7 +4,7 @@ import com.typesafe.sbt.packager.docker.{Cmd, ExecCmd}
 version in Docker := {
   version.value match {
     case stableVersion(_, _)                      => version.value
-    case betaVersion(v1, v2)                      => v1 + "-0.1RC" + v2
+    case betaVersion(v1, v2, v3)                  => v1 + "-0." + v3 + "RC" + v2
     case snapshotVersion(stableVersion(v1, v2))   => v1 + "-" + v2 + "-SNAPSHOT"
     case snapshotVersion(betaVersion(v1, v2, v3)) => v1 + "-0." + v3 + "RC" + v2 + "-SNAPSHOT"
     case _                                        => versionUsage(version.value)
diff --git a/rpm.sbt b/rpm.sbt
index 6c5766420b..b0f4810053 100644
--- a/rpm.sbt
+++ b/rpm.sbt
@@ -3,7 +3,7 @@ import Common.{betaVersion, snapshotVersion, stableVersion, versionUsage}
 version in Rpm := {
   version.value match {
     case stableVersion(v1, _)                   => v1
-    case betaVersion(v1, _)                     => v1
+    case betaVersion(v1, _, _)                  => v1
     case snapshotVersion(stableVersion(v1, _))  => v1
     case snapshotVersion(betaVersion(v1, _, _)) => v1
     case _                                      => versionUsage(version.value)