diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 5e3f889..13ff034 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -78,10 +78,10 @@ jobs:
       - name: Create manifest
         run: |
             docker manifest create \
-              ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }} \
+              ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }} \
               ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-amd64 \
               ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-arm64
 
       - name: Push manifest
         run: |
-            docker manifest push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
+            docker manifest push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
diff --git a/Dockerfile b/Dockerfile
index 99f90c0..9ec4f7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE="phpswoole/swoole:php8.5-alpine"
+ARG BASE_IMAGE="phpswoole/swoole:6.2.0-php8.5-alpine"
 ARG PHP_BUILD_DATE="20250925"
 
 FROM $BASE_IMAGE AS compile
diff --git a/tests.yaml b/tests.yaml
index e14e737..6bc66c0 100644
--- a/tests.yaml
+++ b/tests.yaml
@@ -92,7 +92,7 @@ commandTests:
     command: "php"
     args: ["-v"]
     expectedOutput:
-      - "PHP 8.5.5 (cli)*"
+      - "PHP 8.5.4 (cli)*"
   - name: 'ImageMagick supported formats'
     command: "php"
     args: ["-i"]
@@ -107,7 +107,7 @@ commandTests:
     command: "php"
     args: ["--re", "swoole"]
     expectedOutput:
-      - ".*version 6.2.1.*"
+      - ".*version 6.2.0.*"
   - name: 'ZIP'
     command: "zip"
     args: ["-v"]