diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
new file mode 100644
index 0000000..5ace49f
--- /dev/null
+++ b/.forgejo/workflows/build-image.yml
@@ -0,0 +1,41 @@
+on: [push]
+
+jobs:
+  build-image:
+    runs-on: docker
+    container:
+      image: quay.io/podman/stable:v4.9.0
+    steps:
+      - name: Install additional packages
+        run: |
+          dnf -y install git nodejs
+
+      - name: Setup podman
+        run: |
+          sudo -u podman podman login gitea.angry.im --username PeterCxy --password ${{ secrets.FORGEJO_TOKEN }}
+
+      - name: Repository Checkout
+        uses: https://gitea.angry.im/actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Detect Directory Changes
+        id: changed-dirs
+        uses: https://github.com/tj-actions/changed-files@v42
+        with:
+          dir_names: 'true'
+          dir_names_max_depth: '1'
+          dir_names_exclude_current_dir: 'true'
+          files_ignore: |
+            .forgejo/**
+            build-image.sh
+
+      - name: Build & Push
+        if: ${{ steps.changed-dirs.all_changed_files_count != '0' }}
+        env:
+          ALL_CHANGED_DIRS: ${{ steps.changed-dirs.outputs.all_changed_files }}
+        run: |
+          for file in ${ALL_CHANGED_DIRS}; do
+            echo "---- Building ${file} ----"
+            sudo -u podman ./build-image.sh ${file}
+          done
diff --git a/element-web/Dockerfile b/element-web/Dockerfile
index 3a8aed5..6459f0c 100644
--- a/element-web/Dockerfile
+++ b/element-web/Dockerfile
@@ -1,4 +1,4 @@
-ARG ELEMENT_VER=v1.11.57
+ARG ELEMENT_VER=v1.11.58
 
 FROM debian:11 AS builder