diff --git a/.gitea/workflows/release-images.yaml b/.gitea/workflows/release-images.yaml
index aa6f3a2..72b02fb 100644
--- a/.gitea/workflows/release-images.yaml
+++ b/.gitea/workflows/release-images.yaml
@@ -23,11 +23,11 @@ jobs:
         run: echo "::set-output name=short_hash::$(git rev-parse --short HEAD)"
       - name: Build and push docker
         run: |
-          docker build . -t git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:latest -t git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:nightly-`date '+%Y-%m-%d'`.${{steps.git.outputs.short_hash}} && \
+          docker build . -t git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:latest -t git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:`grep FROM Dockerfile | sed -E 's/FROM .*:([0-9.]+)-(.*)/\1/'`-`date '+%Y-%m-%d'`.${{steps.git.outputs.short_hash}} && \
           docker build . -f Dockerfile.nodejs -t git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust-builder:latest \
-            -t git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust-builder:nightly-`date '+%Y-%m-%d'`.${{steps.git.outputs.short_hash}} \
-            --build-arg BASE_IMAGE=git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:nightly-`date '+%Y-%m-%d'`.${{steps.git.outputs.short_hash}} &&\
-          docker push git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:nightly-`date '+%Y-%m-%d'`.${{steps.git.outputs.short_hash}} && \
+            -t git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust-builder:`grep FROM Dockerfile | sed -E 's/FROM .*:([0-9.]+)-(.*)/\1/'`-`date '+%Y-%m-%d'`.${{steps.git.outputs.short_hash}} \
+            --build-arg BASE_IMAGE=git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:`grep FROM Dockerfile | sed -E 's/FROM .*:([0-9.]+)-(.*)/\1/'`-`date '+%Y-%m-%d'`.${{steps.git.outputs.short_hash}} &&\
+          docker push git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:`grep FROM Dockerfile | sed -E 's/FROM .*:([0-9.]+)-(.*)/\1/'`-`date '+%Y-%m-%d'`.${{steps.git.outputs.short_hash}} && \
           docker push git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust:latest && \
-          docker push git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust-builder:nightly-`date '+%Y-%m-%d'`.${{steps.git.outputs.short_hash}} && \
+          docker push git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust-builder:`grep FROM Dockerfile | sed -E 's/FROM .*:([0-9.]+)-(.*)/\1/'`-`date '+%Y-%m-%d'`.${{steps.git.outputs.short_hash}} && \
           docker push git.nanobyte.cz/$GITHUB_REPOSITORY_OWNER/nano-rust-builder:latest