diff --git a/.goreleaser.yml b/.goreleaser.yml
index 614cdfb72..b0f564f67 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -94,7 +94,7 @@ dockers:
     - CREDITS
   build_flag_templates:
   - "--platform=linux/amd64"
-  - "--build-arg=RELEASE={{ .Tag }}"
+  - "--build-arg=TAG={{ .Tag }}"
 - image_templates:
   - "minio/console:{{ .Tag }}-ppc64le"
   use_buildx: true
@@ -105,7 +105,7 @@ dockers:
     - CREDITS
   build_flag_templates:
   - "--platform=linux/ppc64le"
-  - "--build-arg=RELEASE={{ .Tag }}"
+  - "--build-arg=TAG={{ .Tag }}"
 - image_templates:
   - "minio/console:{{ .Tag }}-s390x"
   use_buildx: true
@@ -116,7 +116,7 @@ dockers:
     - CREDITS
   build_flag_templates:
   - "--platform=linux/s390x"
-  - "--build-arg=RELEASE={{ .Tag }}"
+  - "--build-arg=TAG={{ .Tag }}"
 - image_templates:
   - "minio/console:{{ .Tag }}-arm64"
   use_buildx: true
@@ -128,7 +128,7 @@ dockers:
     - CREDITS
   build_flag_templates:
   - "--platform=linux/arm64"
-  - "--build-arg=RELEASE={{ .Tag }}"
+  - "--build-arg=TAG={{ .Tag }}"
 - image_templates:
   - "quay.io/minio/console:{{ .Tag }}-amd64"
   use_buildx: true
@@ -139,7 +139,7 @@ dockers:
     - CREDITS
   build_flag_templates:
   - "--platform=linux/amd64"
-  - "--build-arg=RELEASE={{ .Tag }}"
+  - "--build-arg=TAG={{ .Tag }}"
 - image_templates:
   - "quay.io/minio/console:{{ .Tag }}-ppc64le"
   use_buildx: true
@@ -150,7 +150,7 @@ dockers:
     - CREDITS
   build_flag_templates:
   - "--platform=linux/ppc64le"
-  - "--build-arg=RELEASE={{ .Tag }}"
+  - "--build-arg=TAG={{ .Tag }}"
 - image_templates:
   - "quay.io/minio/console:{{ .Tag }}-s390x"
   use_buildx: true
@@ -161,7 +161,7 @@ dockers:
     - CREDITS
   build_flag_templates:
   - "--platform=linux/s390x"
-  - "--build-arg=RELEASE={{ .Tag }}"
+  - "--build-arg=TAG={{ .Tag }}"
 - image_templates:
   - "quay.io/minio/console:{{ .Tag }}-arm64"
   use_buildx: true
@@ -173,7 +173,7 @@ dockers:
     - CREDITS
   build_flag_templates:
   - "--platform=linux/arm64"
-  - "--build-arg=RELEASE={{ .Tag }}"
+  - "--build-arg=TAG={{ .Tag }}"
 docker_manifests:
 - name_template: minio/console:{{ .Tag }}
   image_templates:
diff --git a/Dockerfile.release b/Dockerfile.release
index 0783062d7..c6186b048 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -1,6 +1,6 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
 
-ARG RELEASE
+ARG TAG
 
 COPY CREDITS /licenses/CREDITS
 COPY LICENSE /licenses/LICENSE
@@ -8,8 +8,8 @@ COPY LICENSE /licenses/LICENSE
 LABEL name="MinIO" \
       vendor="MinIO Inc <dev@min.io>" \
       maintainer="MinIO Inc <dev@min.io>" \
-      version="${RELEASE}" \
-      release="${RELEASE}" \
+      version="${TAG}" \
+      release="${TAG}" \
       summary="A graphical user interface for MinIO" \
       description="MinIO object storage is fundamentally different. Designed for performance and the S3 API, it is 100% open-source. MinIO is ideal for large, private cloud environments with stringent security requirements and delivers mission-critical availability across a diverse range of workloads."