diff --git a/.woodpecker/build_dev.yml b/.woodpecker/build_dev.yml
index 9f84d81..794e833 100644
--- a/.woodpecker/build_dev.yml
+++ b/.woodpecker/build_dev.yml
@@ -18,6 +18,6 @@ steps:
                 from_secret: DOCKERHUB_TOKEN
             context: ./build
             repo: vistanarvas/${CI_REPO_NAME}
-            tag: ${CI_COMMIT_BRANCH}-php-${PHP_VERSION}
+            tag: test-${CI_COMMIT_BRANCH}-php-${PHP_VERSION}
             build_args:
                 - BASE_VERSION=${PHP_VERSION}
\ No newline at end of file
diff --git a/.woodpecker/build_release.yml b/.woodpecker/build_release.yml
index 4a0b80d..ec568cf 100644
--- a/.woodpecker/build_release.yml
+++ b/.woodpecker/build_release.yml
@@ -7,7 +7,7 @@ matrix:
 
 when:
     branch:
-        include: [ main, master ]
+        include: [ master ]
     cron: nightly
     event: [ cron, release, manual ]
 
@@ -36,4 +36,5 @@ steps:
                 from_secret: DOCKERHUB_TOKEN
             context: ./build
             repo: vistanarvas/${CI_REPO_NAME}
-            tag: php-${PHP_VERSION}
\ No newline at end of file
+            auto_tag: true
+            auto_tag_suffix: -php-${PHP_VERSION}
\ No newline at end of file