diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml
index dc68a60..baafcf6 100644
--- a/.gitea/workflows/publish.yaml
+++ b/.gitea/workflows/publish.yaml
@@ -8,7 +8,7 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - run: sh -c 'curl -sSL https://get.docker.com/ | sh'
+      # - run: sh -c 'curl -sSL https://get.docker.com/ | sh'
       - uses: actions/checkout@v4
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -28,7 +28,7 @@ jobs:
           push: true
           build-args: TOOLCHAIN=stable
           file: 'rustup/Dockerfile'
-          tags: gitea.loadingm.xyz/the10thwiz/rustup:stable,gitea.loadingm.xyz/the10thwiz/rustup:latest
+          tags: gitea.loadingm.xyz/the10thwiz/rustup:stable
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
@@ -43,3 +43,12 @@ jobs:
           build-args: TOOLCHAIN=nightly
           file: 'rustup/Dockerfile'
           tags: gitea.loadingm.xyz/the10thwiz/rustup:nightly
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          build-args: |
+            TOOLCHAIN=stable
+            EXTRA=beta nightly
+          file: 'rustup/Dockerfile'
+          tags: gitea.loadingm.xyz/the10thwiz/rustup:latest
diff --git a/rustup/Dockerfile b/rustup/Dockerfile
index de9aaf3..77a019e 100644
--- a/rustup/Dockerfile
+++ b/rustup/Dockerfile
@@ -23,10 +23,11 @@ RUN apt-get update && \
 #     OPENSSL_INCLUDE_DIR=/usr/local/ssl/include \
 #     OPENSSL_STATIC=1
 
-ARG TOOLCHAIN
-
 # install toolchain
+ARG TOOLCHAIN
 RUN curl https://sh.rustup.rs -sSf | \
     sh -s -- --default-toolchain $TOOLCHAIN -y
-
 ENV PATH=/root/.cargo/bin:$PATH
+
+ARG EXTRA=""
+RUN for name in "$EXTRA"; do rustup install $name; done