diff --git a/.github/workflows/envd-starship.yaml b/.github/workflows/envd-starship.yaml
deleted file mode 100644
index 4172c2825..000000000
--- a/.github/workflows/envd-starship.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: release
-
-on: 
-  release:
-    types: [created]
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-
-  docker:
-    name: Push starship image to Docker Hub
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Docker Login
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERIO_USERNAME }}
-          password: ${{ secrets.DOCKERIO_TOKEN }}
-      - name: Docker Setup QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          file: base-images/envd-starship/envd-starship.Dockerfile
-          platforms: linux/amd64,linux/arm64
-          tags: tensorchord/starship:v0.0.1
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fa0ef8e28..da46c20a3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -73,6 +73,10 @@ jobs:
         mkdir -p bin
         mv dist/envd_darwin_all/envd bin/envd
         chmod +x bin/envd
+    - name: setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
     - name: Build wheels
       uses: pypa/cibuildwheel@v2.16.2
       env:
@@ -82,8 +86,8 @@ jobs:
     - name: Build source distribution
       if: runner.os == 'Linux' # Only release source under linux to avoid conflict
       run: |
-        python3 -m pip install wheel
-        python3 setup.py sdist
+        python -m pip install wheel
+        python setup.py sdist
         mv dist/*.tar.gz wheelhouse/
     - name: Upload to PyPI
       env:
@@ -119,6 +123,30 @@ jobs:
     - name: Docker Buildx
       run: |
           ./base-images/build.sh
+  envd_starship_publish:
+    name: Push starship image to Docker Hub
+    runs-on: ubuntu-latest
+    needs: goreleaser
+    steps:
+    - uses: actions/checkout@v4
+    - name: Docker Login
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERIO_USERNAME }}
+        password: ${{ secrets.DOCKERIO_TOKEN }}
+    - name: Docker Setup QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+        push: true
+        file: base-images/envd-starship/envd-starship.Dockerfile
+        platforms: linux/amd64,linux/arm64
+        tags: tensorchord/starship:v0.0.1
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
   envd_image_push:
     name: Build & push envd images
     # only trigger on main repo when tag starts with v