diff --git a/.github/actions/action.yml b/.github/actions/action.yml
index 68d85d9..bc22786 100644
--- a/.github/actions/action.yml
+++ b/.github/actions/action.yml
@@ -7,6 +7,9 @@ inputs:
   latest:
     description: if tag latest
     required: false
+  workdir:
+    description: workdir
+    required: false    
 runs:
   using: "composite"
   steps:
@@ -34,3 +37,4 @@ runs:
           done
         fi
       shell: bash
+      working-directory: ${{ inputs.workdir }}
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index e7fa82c..4bbb03d 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -85,254 +85,209 @@ jobs:
       - uses: ./.github/actions
         with:
           version: ${{ env.PHP84 }}
+          workdir: 8
           latest: true
-   
-#  php83-build:
-#    strategy:
-#      matrix:
-#        platform:
-#          - linux/amd64
-#          - linux/arm64
-#        include:
-#          - platform: linux/amd64
-#            runner: ubuntu-24.04
-#            arch: amd64
-#          - platform: linux/arm64
-#            runner: ubuntu-24.04-arm
-#            arch: arm64
-#    runs-on: ${{ matrix.runner }}
-#    steps:
-#      - uses: actions/checkout@v4
-#      - uses: docker/login-action@v3
-#        with:
-#          username: ${{ secrets.DOCKER_USERNAME }}
-#          password: ${{ secrets.DOCKER_PASSWORD }}
-#      - uses: docker/setup-buildx-action@v3
-#      - name: build and push
-#        env:
-#          MARIADB_VER: ${{ env.PHP84 }}
-#          TAG: 8.4-${{ matrix.arch }}
-#          PLATFORM: ${{ matrix.platform }}
-#        working-directory: 8
-#        run: |
-#          make buildx-build
-#          make buildx-push
-#  php83-push:
-#    runs-on: ubuntu-latest
-#    needs:
-#      - php84-build
-#    steps:
-#      - uses: actions/checkout@v4
-#      - uses: docker/login-action@v3
-#        with:
-#          username: ${{ secrets.DOCKER_USERNAME }}
-#          password: ${{ secrets.DOCKER_PASSWORD }}
-#      - uses: ./.github/actions
-#        with:
-#          version: ${{ env.PHP84 }}
-   
-#  php83:
-#    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: '8'
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: linux/amd64,linux/arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: ${{ env.PHP83 }}
-#        tags: 8.3
-#        workdir: 8
-#        platform: linux/amd64,linux/arm64
-#  php82:
-#    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: '8'
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: linux/amd64,linux/arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: ${{ env.PHP82 }}
-#        tags: 8.2
-#        workdir: 8
-#        platform: linux/amd64,linux/arm64
-#  php81:
-#    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: '8'
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: linux/amd64,linux/arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: ${{ env.PHP81 }}
-#        tags: 8.1
-#        workdir: 8
-#        platform: linux/amd64,linux/arm64
-#  ### dev
-#  php84-dev:
-#    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: '8'
-#    steps:
-#      - uses: actions/checkout@v4
-#      - uses: docker/setup-qemu-action@v3
-#        with:
-#          platforms: linux/amd64,linux/arm64
-#      - uses: docker/setup-buildx-action@v3
-#      - uses: ./.github/actions
-#        with:
-#          version: ${{ env.PHP84 }}
-#          dev: 1
-#          tags: 8.4-dev,8-dev,dev
-#          workdir: 8
-#          platform: linux/amd64,linux/arm64  
-#  php83-dev:
-#    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: '8'
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: linux/amd64,linux/arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: ${{ env.PHP83 }}
-#        dev: 1
-#        tags: 8.3-dev
-#        workdir: 8
-#        platform: linux/amd64,linux/arm64
-#  php82-dev:
-#    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: '8'
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: linux/amd64,linux/arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: ${{ env.PHP82 }}
-#        dev: 1
-#        tags: 8.2-dev
-#        workdir: 8
-#        platform: linux/amd64,linux/arm64
-#  php81-dev:
-#    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: '8'
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: linux/amd64,linux/arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: ${{ env.PHP81 }}
-#        dev: 1
-#        tags: 8.1-dev
-#        workdir: 8
-#        platform: linux/amd64,linux/arm64
-#  ### dev-macos
-#  php84-dev-macos:
-#    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: '8'
-#    steps:
-#      - uses: actions/checkout@v4
-#      - uses: docker/setup-qemu-action@v3
-#        with:
-#          platforms: linux/amd64,linux/arm64
-#      - uses: docker/setup-buildx-action@v3
-#      - uses: ./.github/actions
-#        with:
-#          version: ${{ env.PHP84 }}
-#          dev: 1
-#          user_id: 501
-#          group_id: 20
-#          tags: 8.4-dev-macos,8-dev-macos,dev-macos
-#          workdir: 8
-#          platform: linux/amd64,linux/arm64  
-#  php83-dev-macos:
-#    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: '8'
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: linux/amd64,linux/arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: ${{ env.PHP83 }}
-#        dev: 1
-#        user_id: 501
-#        group_id: 20
-#        tags: 8.3-dev-macos
-#        workdir: 8
-#        platform: linux/amd64,linux/arm64
-#  php82-dev-macos:
-#    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: '8'
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: linux/amd64,linux/arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: ${{ env.PHP82 }}
-#        dev: 1
-#        user_id: 501
-#        group_id: 20
-#        tags: 8.2-dev-macos
-#        workdir: 8
-#        platform: linux/amd64,linux/arm64
-#  php81-dev-macos:
-#    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: '8'
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: linux/amd64,linux/arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: ${{ env.PHP81 }}
-#        dev: 1
-#        user_id: 501
-#        group_id: 20
-#        tags: 8.1-dev-macos
-#        workdir: 8
-#        platform: linux/amd64,linux/arm64
+
+  php83-build:
+    strategy:
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
+        include:
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+            dev: 1
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+            dev: 1
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+            user_id: 501
+            group_id: 20
+            dev: 1
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+            user_id: 501
+            group_id: 20            
+            dev: 1
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - uses: docker/setup-buildx-action@v3
+      - name: build and push
+        env:
+          PHP_VER: ${{ env.PHP83 }}
+          ARCH: ${{ matrix.arch }}
+          PHP_DEV: ${{ matrix.dev }}
+          WODBY_USER_ID: ${{ matrix.user_id }}
+          WODBY_GROUP_ID: ${{ matrix.group_id }}
+          PLATFORM: ${{ matrix.platform }}
+        working-directory: 8
+        run: |
+          make buildx-build
+          make buildx-push
+  php83-push:
+    runs-on: ubuntu-latest
+    needs:
+      - php83-build
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - uses: ./.github/actions
+        with:
+          version: ${{ env.PHP83 }}
+          workdir: 8
+
+  php82-build:
+    strategy:
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
+        include:
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+            dev: 1
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+            dev: 1
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+            user_id: 501
+            group_id: 20
+            dev: 1
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+            user_id: 501
+            group_id: 20            
+            dev: 1
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - uses: docker/setup-buildx-action@v3
+      - name: build and push
+        env:
+          PHP_VER: ${{ env.PHP82 }}
+          ARCH: ${{ matrix.arch }}
+          PHP_DEV: ${{ matrix.dev }}
+          WODBY_USER_ID: ${{ matrix.user_id }}
+          WODBY_GROUP_ID: ${{ matrix.group_id }}
+          PLATFORM: ${{ matrix.platform }}
+        working-directory: 8
+        run: |
+          make buildx-build
+          make buildx-push
+  php82-push:
+    runs-on: ubuntu-latest
+    needs:
+      - php82-build
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - uses: ./.github/actions
+        with:
+          version: ${{ env.PHP82 }}
+          workdir: 8
+
+  php81-build:
+    strategy:
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
+        include:
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+            dev: 1
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+            dev: 1
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+            user_id: 501
+            group_id: 20
+            dev: 1
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+            user_id: 501
+            group_id: 20            
+            dev: 1
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - uses: docker/setup-buildx-action@v3
+      - name: build and push
+        env:
+          PHP_VER: ${{ env.PHP81 }}
+          ARCH: ${{ matrix.arch }}
+          PHP_DEV: ${{ matrix.dev }}
+          WODBY_USER_ID: ${{ matrix.user_id }}
+          WODBY_GROUP_ID: ${{ matrix.group_id }}
+          PLATFORM: ${{ matrix.platform }}
+        working-directory: 8
+        run: |
+          make buildx-build
+          make buildx-push
+  php81-push:
+    runs-on: ubuntu-latest
+    needs:
+      - php81-build
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - uses: ./.github/actions
+        with:
+          version: ${{ env.PHP81 }}
+          workdir: 8