diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 30ac62f..2cfedd8 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Parse Caddy version
-        run: echo "VERSION=$(grep -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]+$' caddy-cloudflare/Dockerfile | cut -d ':' -f2)"  >> $GITHUB_ENV
+        run: echo "VERSION=$(grep -oP '(?<=FROM caddy:)[0-9]+\.[0-9]+\.[0-9]+' caddy-cloudflare/Dockerfile | head -n 1)"  >> $GITHUB_ENV
       -
         name: Print
         run: echo ${{ env.VERSION }}
\ No newline at end of file