diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 72f7b8f44..0c24021cb 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -35,4 +35,6 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
-          tags: ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
+            ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHORT_SHA }}
diff --git a/Dockerfile b/Dockerfile
index 7e056b51f..d492b1352 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM devkitpro/devkita64:latest
+FROM devkitpro/devkita64:20240602
 
 WORKDIR /app/