diff --git a/docker/build.gradle b/docker/build.gradle
index 394826e3a7..535dd4562c 100644
--- a/docker/build.gradle
+++ b/docker/build.gradle
@@ -42,12 +42,6 @@ enum ImageVariant {
     String dockerFile
     String javaVersion
 
-    String versionString(String baseTag, String version) {
-        return "${baseTag}-${knownAs}" +
-                (knownAs.isEmpty() ? "" : "-") +
-                "java${javaVersion}-" + version
-    }
-
     ImageVariant(ImageVariant other) {
         this.knownAs = other.knownAs
         this.dockerFile = other.dockerFile
@@ -64,16 +58,9 @@ enum ImageVariant {
         return project.properties.getOrDefault("docker.image.repository", "corda/corda")
     }
 
-    static private final String runTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))
-
-    def getName(Project project) {
-        return versionString(getRepository(project), project.version.toString().toLowerCase())
-    }
-
     Set<Identifier> buildTags(Project project) {
-        final String suffix = project.version.toString().toLowerCase().contains("snapshot") ? runTime : "RELEASE"
-        return [suffix, "latest"].stream().map {
-            toAppend -> "${getName(project)}:${toAppend}".toString()
+        return ["${project.version.toString().toLowerCase()}-${knownAs}-${javaVersion}"].stream().map {
+            toAppend -> "${getRepository(project)}:${toAppend}".toString()
         }.map(Identifier.&fromCompoundString).collect(Collectors.toSet())
     }