diff --git a/.github/workflows/release-docker-amd-rocm720-nightly-preview.yml b/.github/workflows/release-docker-amd-rocm720-nightly.yml
similarity index 95%
rename from .github/workflows/release-docker-amd-rocm720-nightly-preview.yml
rename to .github/workflows/release-docker-amd-rocm720-nightly.yml
index 60aee17d1..e3dd653c9 100644
--- a/.github/workflows/release-docker-amd-rocm720-nightly-preview.yml
+++ b/.github/workflows/release-docker-amd-rocm720-nightly.yml
@@ -78,5 +78,5 @@ jobs:
 
           tag=v${version}-${rocm_tag}
 
-          docker build . -f docker/rocm720.Dockerfile --build-arg BUILD_TYPE=${{ matrix.build_type }} --build-arg GPU_ARCH=${{ matrix.gpu_arch }} --build-arg ENABLE_MORI=1 --build-arg NIC_BACKEND=ainic --build-arg SETUPTOOLS_SCM_PRETEND_VERSION=${pretend_version} -t rocm/sgl-dev:${tag}-${{ env.DATE }}-preview --no-cache
-          docker push rocm/sgl-dev:${tag}-${{ env.DATE }}-preview
+          docker build . -f docker/rocm720.Dockerfile --build-arg BUILD_TYPE=${{ matrix.build_type }} --build-arg GPU_ARCH=${{ matrix.gpu_arch }} --build-arg ENABLE_MORI=1 --build-arg NIC_BACKEND=ainic --build-arg SETUPTOOLS_SCM_PRETEND_VERSION=${pretend_version} -t rocm/sgl-dev:${tag}-${{ env.DATE }} --no-cache
+          docker push rocm/sgl-dev:${tag}-${{ env.DATE }}
diff --git a/.github/workflows/release-docker-amd.yml b/.github/workflows/release-docker-amd.yml
index 2f2b61367..1dbb04659 100644
--- a/.github/workflows/release-docker-amd.yml
+++ b/.github/workflows/release-docker-amd.yml
@@ -16,6 +16,7 @@ jobs:
     environment: 'prod'
     strategy:
       matrix:
+        rocm_version: ['rocm700', 'rocm720']
         gpu_arch: ['gfx942', 'gfx950']
         build_type: ['all']
     steps:
@@ -55,17 +56,36 @@ jobs:
           version=${{ steps.version.outputs.version }}
           echo "Version: ${version}"
 
-          if [ "${{ matrix.gpu_arch }}" = "gfx942" ]; then
-            rocm_tag="rocm700-mi30x"
-          elif [ "${{ matrix.gpu_arch }}" = "gfx950" ]; then
-            rocm_tag="rocm700-mi35x"
+          dockerfile=""
+          gpu_arch_suffix=""
+          if [ "${{ matrix.rocm_version }}" = "rocm700" ]; then
+            dockerfile="docker/rocm.Dockerfile"
+            if [ "${{ matrix.gpu_arch }}" = "gfx942" ]; then
+              rocm_tag="rocm700-mi30x"
+            elif [ "${{ matrix.gpu_arch }}" = "gfx950" ]; then
+              rocm_tag="rocm700-mi35x"
+            else
+              echo "Unsupported gfx arch"
+              exit 1
+            fi
+          elif [ "${{ matrix.rocm_version }}" = "rocm720" ]; then
+            gpu_arch_suffix="-${{ matrix.rocm_version }}"
+            dockerfile="docker/rocm720.Dockerfile"
+            if [ "${{ matrix.gpu_arch }}" = "gfx942" ]; then
+              rocm_tag="rocm720-mi30x"
+            elif [ "${{ matrix.gpu_arch }}" = "gfx950" ]; then
+              rocm_tag="rocm720-mi35x"
+            else
+              echo "Unsupported gfx arch"
+              exit 1
+            fi
           else
-            echo "Unsupported gfx arch"
+            echo "Unsupported rocm version"
             exit 1
           fi
 
           tag=v${version}-${rocm_tag}
 
           # rocm.Dockerfile expects SGL_BRANCH with 'v' prefix for git tag checkout
-          docker build . -f docker/rocm.Dockerfile --build-arg BUILD_TYPE=${{ matrix.build_type }} --build-arg GPU_ARCH=${{ matrix.gpu_arch }} --build-arg SGL_BRANCH=v${version} --build-arg ENABLE_MORI=1 --build-arg NIC_BACKEND=ainic -t lmsysorg/sglang:${tag} --no-cache
+          docker build . -f ${dockerfile} --build-arg BUILD_TYPE=${{ matrix.build_type }} --build-arg GPU_ARCH=${{ matrix.gpu_arch }}${gpu_arch_suffix} --build-arg SGL_BRANCH=v${version} --build-arg ENABLE_MORI=1 --build-arg NIC_BACKEND=ainic -t lmsysorg/sglang:${tag} --no-cache
           docker push lmsysorg/sglang:${tag}