diff --git a/.github/workflows/docker-GA-images.yml b/.github/workflows/docker-GA-images.yml
index 9f8e49a549d0..e871100f0dfa 100644
--- a/.github/workflows/docker-GA-images.yml
+++ b/.github/workflows/docker-GA-images.yml
@@ -74,7 +74,7 @@ jobs:
           echo "HIVE_VERSION=${{ github.event.inputs.hiveVersion }}"  >> $GITHUB_ENV
           echo "HADOOP_VERSION=${{ github.event.inputs.hadoopVersion }}" >> $GITHUB_ENV
           echo "TEZ_VERSION=${{ github.event.inputs.tezVersion }}" >> $GITHUB_ENV
-          echo "BUILD_ENV=archive" >> $GITHUB_ENV
+          echo "BUILD_ENV=release" >> $GITHUB_ENV
 
       - name: Prepare environment variables for Release
         if: github.event_name == 'create' && github.event.ref_type == 'tag' && startsWith(github.event.ref, 'rel/')
@@ -82,7 +82,7 @@ jobs:
           echo "HIVE_VERSION=$(mvn -f "pom.xml" -q help:evaluate -Dexpression=project.version -DforceStdout)" >> $GITHUB_ENV
           echo "HADOOP_VERSION=$(mvn -f "pom.xml" -q help:evaluate -Dexpression=hadoop.version -DforceStdout)" >> $GITHUB_ENV
           echo "TEZ_VERSION=$(mvn -f "pom.xml" -q help:evaluate -Dexpression=tez.version -DforceStdout)" >> $GITHUB_ENV
-          echo "BUILD_ENV=buildarchive" >> $GITHUB_ENV
+          echo "BUILD_ENV=hybrid" >> $GITHUB_ENV
 
       - name: Prepare common environment variables
         run: |
diff --git a/packaging/src/docker/Dockerfile b/packaging/src/docker/Dockerfile
index b26d2a2cc8ec..72e6e81ea0cf 100644
--- a/packaging/src/docker/Dockerfile
+++ b/packaging/src/docker/Dockerfile
@@ -14,14 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-ARG BUILD_ENV
+ARG BUILD_ENV=local
 
-FROM ubuntu as unarchive
+FROM ubuntu AS local
 ONBUILD COPY hadoop-*.tar.gz /opt
 ONBUILD COPY apache-hive-*-bin.tar.gz /opt
 ONBUILD COPY apache-tez-*-bin.tar.gz /opt
 
-FROM ubuntu as archive
+FROM ubuntu AS release
 ARG HADOOP_VERSION
 ARG HIVE_VERSION
 ARG TEZ_VERSION
@@ -33,7 +33,7 @@ ONBUILD RUN mv /apache-tez-$TEZ_VERSION-bin.tar.gz /opt && \
  mv hadoop-$HADOOP_VERSION.tar.gz /opt && \
  mv apache-hive-$HIVE_VERSION-bin.tar.gz /opt
 
-FROM ubuntu as buildarchive
+FROM ubuntu AS hybrid
 ARG HADOOP_VERSION
 ARG HIVE_VERSION
 ARG TEZ_VERSION
@@ -44,7 +44,7 @@ ONBUILD COPY ./apache-hive-$HIVE_VERSION-bin.tar.gz /opt
 ONBUILD RUN mv /apache-tez-$TEZ_VERSION-bin.tar.gz /opt && \
  mv hadoop-$HADOOP_VERSION.tar.gz /opt
 
-FROM ${BUILD_ENV} as env
+FROM ${BUILD_ENV} AS env
 RUN echo ${BUILD_ENV}
 ARG HADOOP_VERSION
 ARG HIVE_VERSION
diff --git a/packaging/src/docker/build.sh b/packaging/src/docker/build.sh
index 66527e2632e9..5687c5830ee2 100755
--- a/packaging/src/docker/build.sh
+++ b/packaging/src/docker/build.sh
@@ -127,7 +127,6 @@ docker build \
         "$WORK_DIR" \
         -f "$WORK_DIR/Dockerfile" \
         -t "$repo/hive:$HIVE_VERSION" \
-        --build-arg "BUILD_ENV=unarchive" \
         --build-arg "HIVE_VERSION=$HIVE_VERSION" \
         --build-arg "HADOOP_VERSION=$HADOOP_VERSION" \
         --build-arg "TEZ_VERSION=$TEZ_VERSION" \
diff --git a/standalone-metastore/packaging/src/docker/Dockerfile b/standalone-metastore/packaging/src/docker/Dockerfile
index 864bdadf8241..12e17a2d0d9d 100644
--- a/standalone-metastore/packaging/src/docker/Dockerfile
+++ b/standalone-metastore/packaging/src/docker/Dockerfile
@@ -14,13 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-ARG BUILD_ENV
+ARG BUILD_ENV=local
 
-FROM ubuntu as unarchive
+FROM ubuntu AS local
 ONBUILD COPY hadoop-*.tar.gz /opt
 ONBUILD COPY hive-standalone-metastore-*-bin.tar.gz /opt
 
-FROM ubuntu as archive
+FROM ubuntu AS release
 ARG HADOOP_VERSION
 ARG HIVE_VERSION
 ONBUILD RUN apt-get update && apt-get -y install wget
@@ -29,7 +29,7 @@ ONBUILD RUN wget --no-verbose https://archive.apache.org/dist/hadoop/core/hadoop
 ONBUILD RUN mv hadoop-$HADOOP_VERSION.tar.gz /opt && \
  mv hive-standalone-metastore-$HIVE_VERSION-bin.tar.gz /opt
 
-FROM ubuntu as buildarchive
+FROM ubuntu AS hybrid
 ARG HADOOP_VERSION
 ARG HIVE_VERSION
 ONBUILD RUN apt-get update && apt-get -y install wget
@@ -37,7 +37,7 @@ ONBUILD RUN wget --no-verbose https://archive.apache.org/dist/hadoop/core/hadoop
 ONBUILD COPY ./hive-standalone-metastore-$HIVE_VERSION-bin.tar.gz /opt
 ONBUILD RUN mv hadoop-$HADOOP_VERSION.tar.gz /opt
 
-FROM ${BUILD_ENV} as env
+FROM ${BUILD_ENV} AS env
 RUN echo ${BUILD_ENV}
 ARG HADOOP_VERSION
 ARG HIVE_VERSION
diff --git a/standalone-metastore/packaging/src/docker/build.sh b/standalone-metastore/packaging/src/docker/build.sh
index 80d50503d998..490ca284b619 100755
--- a/standalone-metastore/packaging/src/docker/build.sh
+++ b/standalone-metastore/packaging/src/docker/build.sh
@@ -107,7 +107,6 @@ docker build \
         "$WORK_DIR" \
         -f "$WORK_DIR/Dockerfile" \
         -t "$repo/hive:standalone-metastore-$HIVE_VERSION" \
-        --build-arg "BUILD_ENV=unarchive" \
         --build-arg "HIVE_VERSION=$HIVE_VERSION" \
         --build-arg "HADOOP_VERSION=$HADOOP_VERSION" \