diff --git a/.gitea/workflows/action.yml b/.gitea/workflows/action.yml
index 3718d2a..f86a6e2 100644
--- a/.gitea/workflows/action.yml
+++ b/.gitea/workflows/action.yml
@@ -6,7 +6,7 @@ on:
       - 'master'
 
 jobs:
-  build_act:
+  build_act_base:
     runs-on: 'priviliged'
     steps:
       - name: Install Docker
@@ -31,96 +31,41 @@ jobs:
           tags: |
             git.euph.dev/actions/runner-basic:latest
             git.euph.dev/actions/runner-basic:${{ gitea.run_number }}
-
-  build_php:
-    runs-on: 'priviliged'
-    needs: build_act
-    strategy:
-      matrix:
-        version: [8.1, 8.2, 8.3]
-    steps:
-      - name: Install Docker
-        run: |
-          rm $(which docker) && curl -fsSL https://get.docker.com | sh
-      - name: Set up QEMU
-        uses: 'https://git.euph.dev/actions/docker-setup-qemu@v3'
-      - name: Setup Buildx
-        uses: 'https://git.euph.dev/actions/docker-setup-buildx@v3'
-      - name: Login to Registry
-        uses: 'https://git.euph.dev/actions/docker-login@v3'
-        with:
-          registry: git.euph.dev
-          username: ${{ secrets.DEPLOY_USER }}
-          password: ${{ secrets.DEPLOY_SECRET }}
-      - name: Build and push php image
-        id: build_act_php
-        uses: 'https://git.euph.dev/actions/docker-build-push@v5'
-        with:
-          context: "{{defaultContext}}:images/actions/php"
-          push: true
-          build-args: PACKAGE_VERSION=${{ matrix.version }}
-          tags: |
-            git.euph.dev/actions/runner-php-${{ matrix.version }}:latest
-            git.euph.dev/actions/runner-php-${{ matrix.version }}:${{ gitea.run_number }}
-
-  build_java:
-    runs-on: 'priviliged'
-    needs: build_act
-    strategy:
-      matrix:
-        version: [8, 17, 21]
-    steps:
-      - name: Install Docker
-        run: |
-          rm $(which docker) && curl -fsSL https://get.docker.com | sh
-      - name: Set up QEMU
-        uses: 'https://git.euph.dev/actions/docker-setup-qemu@v3'
-      - name: Setup Buildx
-        uses: 'https://git.euph.dev/actions/docker-setup-buildx@v3'
-      - name: Login to Registry
-        uses: 'https://git.euph.dev/actions/docker-login@v3'
-        with:
-          registry: git.euph.dev
-          username: ${{ secrets.DEPLOY_USER }}
-          password: ${{ secrets.DEPLOY_SECRET }}
-      - name: Build and push java image
-        id: build_act_java
-        uses: 'https://git.euph.dev/actions/docker-build-push@v5'
-        with:
-          context: "{{defaultContext}}:images/actions/java"
-          push: true
-          build-args: PACKAGE_VERSION=${{ matrix.version }}
-          tags: |
-            git.euph.dev/actions/runner-java-${{ matrix.version }}:latest
-            git.euph.dev/actions/runner-java-${{ matrix.version }}:${{ gitea.run_number }}
-
-  build_lua:
-    runs-on: 'priviliged'
-    needs: build_act
-    strategy:
-      matrix:
-        version: [5.1, 5.2, 5.3, 5.4]
-    steps:
-      - name: Install Docker
-        run: |
-          rm $(which docker) && curl -fsSL https://get.docker.com | sh
-      - name: Set up QEMU
-        uses: 'https://git.euph.dev/actions/docker-setup-qemu@v3'
-      - name: Setup Buildx
-        uses: 'https://git.euph.dev/actions/docker-setup-buildx@v3'
-      - name: Login to Registry
-        uses: 'https://git.euph.dev/actions/docker-login@v3'
-        with:
-          registry: git.euph.dev
-          username: ${{ secrets.DEPLOY_USER }}
-          password: ${{ secrets.DEPLOY_SECRET }}
-      - name: Build and push Lua image
-        id: build_act_lua
-        uses: 'https://git.euph.dev/actions/docker-build-push@v5'
-        with:
-          context: "{{defaultContext}}:images/actions/lua"
-          push: true
-          build-args: PACKAGE_VERSION=${{ matrix.version }}
-          tags: |
-            git.euph.dev/actions/runner-lua-${{ matrix.version }}:latest
-            git.euph.dev/actions/runner-lua-${{ matrix.version }}:${{ gitea.run_number }}
\ No newline at end of file
+            
+    build_act_images:
+        runs-on: 'priviliged'
+        needs: build_act
+        strategy:
+            matrix:
+                language: [java, php, lua]
+                include:
+                  - version: [8, 17, 21]
+                    language: java
+                  - version: [8.1, 8.2, 8.3]
+                    language: php
+                  - version: [5.1, 5.2, 5.3, 5.4]
+                    language: lua
+        steps:
+        - name: Install Docker
+            run: |
+            rm $(which docker) && curl -fsSL https://get.docker.com | sh
+        - name: Set up QEMU
+            uses: 'https://git.euph.dev/actions/docker-setup-qemu@v3'
+        - name: Setup Buildx
+            uses: 'https://git.euph.dev/actions/docker-setup-buildx@v3'
+        - name: Login to Registry
+            uses: 'https://git.euph.dev/actions/docker-login@v3'
+            with:
+            registry: git.euph.dev
+            username: ${{ secrets.DEPLOY_USER }}
+            password: ${{ secrets.DEPLOY_SECRET }}
+        - name: Build and push ${{ matrix.language }} image
+            id: build_act_${{ matrix.language }}
+            uses: 'https://git.euph.dev/actions/docker-build-push@v5'
+            with:
+            context: "{{defaultContext}}:images/actions/${{ matrix.language }}"
+            push: true
+            build-args: PACKAGE_VERSION=${{ matrix.version }}
+            tags: |
+                git.euph.dev/actions/runner-${{ matrix.language }}-${{ matrix.version }}:latest
+                git.euph.dev/actions/runner-${{ matrix.language }}-${{ matrix.version }}:${{ gitea.run_number }}
\ No newline at end of file