diff --git a/.forgejo/workflows/godot-ci.yml b/.forgejo/workflows/godot-ci.yml
index cc042a3..7704181 100644
--- a/.forgejo/workflows/godot-ci.yml
+++ b/.forgejo/workflows/godot-ci.yml
@@ -13,7 +13,7 @@ jobs:
     name: Windows Export
     runs-on: docker
     container:
-      image: git.antonio-da.dev/antoniodell/godot-ci:latest
+      image: git.antonio-da.dev/antoniodell/godot-ci:v1
     steps:
       - name: Checkout
         uses: https://code.forgejo.org/actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
     name: Linux Export
     runs-on: docker
     container:
-      image: git.antonio-da.dev/antoniodell/godot-ci:latest
+      image: git.antonio-da.dev/antoniodell/godot-ci:v1
     steps:
       - name: Checkout
         uses: https://code.forgejo.org/actions/checkout@v4
@@ -63,7 +63,7 @@ jobs:
     name: Web Export
     runs-on: docker
     container:
-      image: git.antonio-da.dev/antoniodell/godot-ci:latest
+      image: git.antonio-da.dev/antoniodell/godot-ci:v1
     steps:
       - name: Checkout
         uses: https://code.forgejo.org/actions/checkout@v4
@@ -87,7 +87,7 @@ jobs:
     name: Mac Export
     runs-on: docker
     container:
-      image: git.antonio-da.dev/antoniodell/godot-ci:latest
+      image: git.antonio-da.dev/antoniodell/godot-ci:v1
     steps:
       - name: Checkout
         uses: https://code.forgejo.org/actions/checkout@v4
diff --git a/Dockerfile b/Dockerfile
index dd907f5..161c60b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Based on https://github.com/abarichello/godot-ci/blob/master/Dockerfile
-FROM node:20.16-bullseye
+FROM node:20.16-bullseye AS base
 
 USER root
 SHELL ["/bin/bash", "-c"]
@@ -18,6 +18,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     osslsigncode \
     && rm -rf /var/lib/apt/lists/*
 
+
+FROM base
 # When in doubt, see the downloads page: https://godotengine.org/download/archive/
 ARG GODOT_VERSION="4.3"