diff --git a/.forgejo/actions/build-docker/action.yml b/.forgejo/actions/build-docker/action.yml
index 1cdf138..ebf3c5b 100644
--- a/.forgejo/actions/build-docker/action.yml
+++ b/.forgejo/actions/build-docker/action.yml
@@ -22,7 +22,9 @@ runs:
       with:
         username: ${{ inputs.username }}
 
-    - name: Build-Docker Build Docker Image
+    # Both dockerfile and context provided
+    - name: Build-Docker Build (df + ctx)
+      if: ${{ inputs.dockerfile != '' && inputs.context != '' }}
       uses: https://git.lhprovedor.com.br/leandro/forgejo-kaniko-action@v3
       with:
         image: ${{ inputs.username }}/${{ env.IMAGE_NAME }}:${{ github.sha }},${{ inputs.username }}/${{ env.IMAGE_NAME }}:latest
@@ -30,3 +32,32 @@ runs:
         password: ${{ inputs.password }}
         dockerfile: ${{ inputs.dockerfile }}
         context: ${{ inputs.context }}
+
+    # Only dockerfile provided
+    - name: Build-Docker Build (df only)
+      if: ${{ inputs.dockerfile != '' && (inputs.context == '' || !inputs.context) }}
+      uses: https://git.lhprovedor.com.br/leandro/forgejo-kaniko-action@v3
+      with:
+        image: ${{ inputs.username }}/${{ env.IMAGE_NAME }}:${{ github.sha }},${{ inputs.username }}/${{ env.IMAGE_NAME }}:latest
+        username: ${{ inputs.username }}
+        password: ${{ inputs.password }}
+        dockerfile: ${{ inputs.dockerfile }}
+
+    # Only context provided
+    - name: Build-Docker Build (ctx only)
+      if: ${{ (inputs.dockerfile == '' || !inputs.dockerfile) && inputs.context != '' }}
+      uses: https://git.lhprovedor.com.br/leandro/forgejo-kaniko-action@v3
+      with:
+        image: ${{ inputs.username }}/${{ env.IMAGE_NAME }}:${{ github.sha }},${{ inputs.username }}/${{ env.IMAGE_NAME }}:latest
+        username: ${{ inputs.username }}
+        password: ${{ inputs.password }}
+        context: ${{ inputs.context }}
+
+    # Neither dockerfile nor context provided
+    - name: Build-Docker Build (defaults)
+      if: ${{ (inputs.dockerfile == '' || !inputs.dockerfile) && (inputs.context == '' || !inputs.context) }}
+      uses: https://git.lhprovedor.com.br/leandro/forgejo-kaniko-action@v3
+      with:
+        image: ${{ inputs.username }}/${{ env.IMAGE_NAME }}:${{ github.sha }},${{ inputs.username }}/${{ env.IMAGE_NAME }}:latest
+        username: ${{ inputs.username }}
+        password: ${{ inputs.password }}