diff --git a/distribution/docker/oss-ubi-docker-build-context/build.gradle b/distribution/docker/oss-ubi-docker-build-context/build.gradle
index 313adb19187..acae9f68d8e 100644
--- a/distribution/docker/oss-ubi-docker-build-context/build.gradle
+++ b/distribution/docker/oss-ubi-docker-build-context/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'base'
 task buildOssUbiDockerBuildContext(type: Tar) {
     extension = 'tar.gz'
     compression = Compression.GZIP
-    archiveClassifier = "oss-ubi7-docker-build-context"
-    archiveBaseName = "elasticsearch"
+    archiveClassifier = "docker-build-context"
+    archiveBaseName = "elasticsearch-oss-ubi7"
     with dockerBuildContext(true, true, false)
 }
 
diff --git a/distribution/docker/ubi-docker-build-context/build.gradle b/distribution/docker/ubi-docker-build-context/build.gradle
index 0186c0a313d..941bb0c89fc 100644
--- a/distribution/docker/ubi-docker-build-context/build.gradle
+++ b/distribution/docker/ubi-docker-build-context/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'base'
 task buildUbiDockerBuildContext(type: Tar) {
     extension = 'tar.gz'
     compression = Compression.GZIP
-    archiveClassifier = "ubi7-docker-build-context"
-    archiveBaseName = "elasticsearch"
+    archiveClassifier = "docker-build-context"
+    archiveBaseName = "elasticsearch-ubi7"
     with dockerBuildContext(false, true, false)
 }