diff --git a/.gitea/workflows/node-npm.yaml b/.gitea/workflows/node-npm.yaml
index 4f0bbcd..5edd938 100644
--- a/.gitea/workflows/node-npm.yaml
+++ b/.gitea/workflows/node-npm.yaml
@@ -16,7 +16,7 @@ jobs:
     container: catthehacker/ubuntu:act-latest
 
     steps:
-    - name: Checkout
+    - name: Build Docker image
       uses: https://git.kjan.de/actions/docker-build@v1
       with:
         name: node-npm      
diff --git a/.gitea/workflows/node-ssh.yaml b/.gitea/workflows/node-ssh.yaml
index 0bd7c69..c21ca3d 100644
--- a/.gitea/workflows/node-ssh.yaml
+++ b/.gitea/workflows/node-ssh.yaml
@@ -16,48 +16,11 @@ jobs:
     container: catthehacker/ubuntu:act-latest
 
     steps:
-    - name: Checkout
-      uses: https://git.kjan.de/actions/checkout@v4
-
-    - name: Set up Docker Buildx
-      uses: https://git.kjan.de/actions/setup-buildx-action@v3
-
-    - name: Login to local Docker Registry
-      uses: https://git.kjan.de/actions/login-action@v3
+    - name: Build Docker image
+      uses: https://git.kjan.de/actions/docker-build@v1
       with:
-        registry: git.kjan.de
-        username: ${{ secrets.REGISTRY_USERNAME }}
-        password: ${{ secrets.REGISTRY_TOKEN }}
-
-    - name: Login to Docker.io Registry
-      uses: https://git.kjan.de/actions/login-action@v3
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Cache Docker layers
-      uses: actions/cache@v4
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-node-ssh-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-node-ssh-   
-
-    - name: Build and push
-      uses: https://git.kjan.de/actions/build-push-action@v6
-      with:
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-        context: ./images/actions/node-ssh
-        push: ${{ github.ref == 'refs/heads/main' }}
-        tags: |
-          git.kjan.de/actions/node-ssh:latest
-            git.kjan.de/actions/node-ssh:${{ gitea.sha }}       
-
-    - # Temp fix
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      name: Move cache
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache             
+        name: node-ssh      
+        REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+        REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}           
diff --git a/.gitea/workflows/php-8.2.yaml b/.gitea/workflows/php-8.2.yaml
index 944f9dc..94c9498 100644
--- a/.gitea/workflows/php-8.2.yaml
+++ b/.gitea/workflows/php-8.2.yaml
@@ -16,49 +16,11 @@ jobs:
     container: catthehacker/ubuntu:act-latest
 
     steps:
-    - name: Checkout
-      uses: https://git.kjan.de/actions/checkout@v4
-
-    - name: Set up Docker Buildx
-      uses: https://git.kjan.de/actions/setup-buildx-action@v3
-
-    - name: Login to local Docker Registry
-      uses: https://git.kjan.de/actions/login-action@v3
+    - name: Build Docker image
+      uses: https://git.kjan.de/actions/docker-build@v1
       with:
-        registry: git.kjan.de
-        username: ${{ secrets.REGISTRY_USERNAME }}
-        password: ${{ secrets.REGISTRY_TOKEN }}
-
-    - name: Login to Docker.io Registry
-      uses: https://git.kjan.de/actions/login-action@v3
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Cache Docker layers
-      uses: actions/cache@v4
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-php-8-2-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-php-8-2-       
-
-    - name: Build and push
-      uses: https://git.kjan.de/actions/build-push-action@v6
-      with:
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-        context: ./images/actions/php-8.2
-        push: ${{ github.ref == 'refs/heads/main' }}
-        tags: |
-          git.kjan.de/actions/php-8.2:latest
-            git.kjan.de/actions/php-8.2:${{ gitea.sha }}     
-
-    - # Temp fix
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      name: Move cache
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache                        
-
+        name: php-8.2      
+        REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+        REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}           
diff --git a/.gitea/workflows/php-deployer.yaml b/.gitea/workflows/php-deployer.yaml
index 7be1b51..5ee6fa1 100644
--- a/.gitea/workflows/php-deployer.yaml
+++ b/.gitea/workflows/php-deployer.yaml
@@ -16,48 +16,11 @@ jobs:
     container: catthehacker/ubuntu:act-latest
 
     steps:
-    - name: Checkout
-      uses: https://git.kjan.de/actions/checkout@v4
-
-    - name: Set up Docker Buildx
-      uses: https://git.kjan.de/actions/setup-buildx-action@v3
-
-    - name: Login to local Docker Registry
-      uses: https://git.kjan.de/actions/login-action@v3
+    - name: Build Docker image
+      uses: https://git.kjan.de/actions/docker-build@v1
       with:
-        registry: git.kjan.de
-        username: ${{ secrets.REGISTRY_USERNAME }}
-        password: ${{ secrets.REGISTRY_TOKEN }}
-
-    - name: Login to Docker.io Registry
-      uses: https://git.kjan.de/actions/login-action@v3
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Cache Docker layers
-      uses: actions/cache@v4
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-php-deployer-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-php-deployer- 
-
-    - name: Build and push
-      uses: https://git.kjan.de/actions/build-push-action@v6
-      with:
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-        context: ./images/actions/php-deployer
-        push: ${{ github.ref == 'refs/heads/main' }}
-        tags: |
-          git.kjan.de/actions/php-deployer:latest
-            git.kjan.de/actions/php-deployer:${{ gitea.sha }}            
-
-    - # Temp fix
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      name: Move cache
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache                
+        name: php-deployer      
+        REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+        REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}               
diff --git a/.gitea/workflows/rust-node.yaml b/.gitea/workflows/rust-node.yaml
index d6cd93c..caa3e14 100644
--- a/.gitea/workflows/rust-node.yaml
+++ b/.gitea/workflows/rust-node.yaml
@@ -16,48 +16,11 @@ jobs:
     container: catthehacker/ubuntu:act-latest
 
     steps:
-    - name: Checkout
-      uses: https://git.kjan.de/actions/checkout@v4
-
-    - name: Set up Docker Buildx
-      uses: https://git.kjan.de/actions/setup-buildx-action@v3
-
-    - name: Login to local Docker Registry
-      uses: https://git.kjan.de/actions/login-action@v3
+    - name: Build Docker image
+      uses: https://git.kjan.de/actions/docker-build@v1
       with:
-        registry: git.kjan.de
-        username: ${{ secrets.REGISTRY_USERNAME }}
-        password: ${{ secrets.REGISTRY_TOKEN }}
-
-    - name: Login to Docker.io Registry
-      uses: https://git.kjan.de/actions/login-action@v3
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Cache Docker layers
-      uses: actions/cache@v4
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-rust-node-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-rust-node-   
-
-    - name: Build and push
-      uses: https://git.kjan.de/actions/build-push-action@v6
-      with:
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-        context: ./images/actions/rust-node
-        push: ${{ github.ref == 'refs/heads/main' }}
-        tags: |
-          git.kjan.de/actions/rust-node:latest
-          git.kjan.de/actions/rust-node:${{ gitea.sha }}       
-
-    - # Temp fix
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      name: Move cache
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache      
+        name: rust-node      
+        REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+        REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}               
diff --git a/.gitea/workflows/zmk-builder.yaml b/.gitea/workflows/zmk-builder.yaml
index 2bd8238..d4a6ab8 100644
--- a/.gitea/workflows/zmk-builder.yaml
+++ b/.gitea/workflows/zmk-builder.yaml
@@ -16,49 +16,11 @@ jobs:
     container: catthehacker/ubuntu:act-latest
 
     steps:
-    - name: Checkout
-      uses: https://git.kjan.de/actions/checkout@v4
-
-    - name: Set up Docker Buildx
-      uses: https://git.kjan.de/actions/setup-buildx-action@v3
-
-    - name: Login to local Docker Registry
-      uses: https://git.kjan.de/actions/login-action@v3
+    - name: Build Docker image
+      uses: https://git.kjan.de/actions/docker-build@v1
       with:
-        registry: git.kjan.de
-        username: ${{ secrets.REGISTRY_USERNAME }}
-        password: ${{ secrets.REGISTRY_TOKEN }}
-
-    - name: Login to Docker.io Registry
-      uses: https://git.kjan.de/actions/login-action@v3
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Cache Docker layers
-      uses: actions/cache@v4
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-zmk-builder-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-zmk-builder-                
-
-    - name: Build and push
-      uses: https://git.kjan.de/actions/build-push-action@v6
-      with:
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-        context: ./images/actions/zmk-builder
-        push: ${{ github.ref == 'refs/heads/main' }}
-        tags: |
-          git.kjan.de/actions/zmk-builder:latest
-          git.kjan.de/actions/zmk-builder:${{ gitea.sha }}             
-
-    - # Temp fix
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      name: Move cache
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache                       
-
+        name: zmk-builder      
+        REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+        REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}