diff --git a/.forgejo/workflows/publish.yaml b/.forgejo/workflows/publish.yaml
index f27a71a..2dc11c9 100644
--- a/.forgejo/workflows/publish.yaml
+++ b/.forgejo/workflows/publish.yaml
@@ -58,9 +58,17 @@ jobs:
         uses: docker/setup-buildx-action@v3
         with:
           driver: docker-container
-      - name: Build and push
+      - name: Build and push alpine
         uses: docker/build-push-action@v6
         with:
+          context: alpine
           push: true
           platforms: linux/amd64, linux/arm64
-          tags: ${{ vars.REGISTRY_URL }}/${{ env.GITHUB_REPOSITORY }}:latest
+          tags: ${{ vars.REGISTRY_URL }}/${{ env.GITHUB_REPOSITORY }}-alpine:latest
+      - name: Build and push ubuntu
+        uses: docker/build-push-action@v6
+        with:
+          context: alpine
+          push: true
+          platforms: linux/amd64, linux/arm64
+          tags: ${{ vars.REGISTRY_URL }}/${{ env.GITHUB_REPOSITORY }}-ubuntu:latest
diff --git a/Dockerfile-alpine b/alpine/Dockerfile
similarity index 100%
rename from Dockerfile-alpine
rename to alpine/Dockerfile
diff --git a/Dockerfile-ubuntu b/ubuntu/Dockerfile
similarity index 100%
rename from Dockerfile-ubuntu
rename to ubuntu/Dockerfile