diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 0708ea9..426e305 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -8,8 +8,8 @@
 # This release drafter follows the conventions from https://keepachangelog.com, https://common-changelog.org/
 # https://www.conventionalcommits.org
 
-name-template: $(echo $GITHUB_REF | sed 's/refs\/tags\///')
-tag-template: $(echo $GITHUB_REF | sed 's/refs\/tags\///')
+name-template: 'v$RESOLVED_VERSION'
+tag-template: 'v$RESOLVED_VERSION'
 template: |
   ## What Changed 👀
   $CHANGES
diff --git a/.github/workflows/build-publish-docker.yml b/.github/workflows/build-publish-docker.yml
index 6387120..78810f7 100644
--- a/.github/workflows/build-publish-docker.yml
+++ b/.github/workflows/build-publish-docker.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Print release tag
-        run: echo "The release tag is $(echo $GITHUB_REF | sed 's/refs\/tags\///')"
+        run: echo "The release tag is $(echo 'v$RESOLVED_VERSION')"
 
       - name: Login to DockerHub
         uses: docker/login-action@v2