diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle
index b9766744fba86..c75802f0a0fcc 100644
--- a/distribution/docker/build.gradle
+++ b/distribution/docker/build.gradle
@@ -408,7 +408,7 @@ void addBuildEssDockerImageTask(Architecture architecture) {
 
       from(projectDir.resolve("src/docker/Dockerfile.cloud-ess")) {
         expand([
-          base_image: "elasticsearch${DockerBase.CLOUD.suffix}:${VersionProperties.elasticsearch}"
+          base_image: "elasticsearch${DockerBase.CLOUD.suffix}:${architecture.classifier}"
         ])
         filter SquashNewlinesFilter
         rename ~/Dockerfile\.cloud-ess$/, 'Dockerfile'
diff --git a/distribution/docker/ironbank-aarch64-docker-export/build.gradle b/distribution/docker/ironbank-docker-aarch64-export/build.gradle
similarity index 100%
rename from distribution/docker/ironbank-aarch64-docker-export/build.gradle
rename to distribution/docker/ironbank-docker-aarch64-export/build.gradle