diff --git a/.gitea/workflows/release-cron.yml b/.gitea/workflows/release-cron.yml
index 4f586f5284..735404129a 100644
--- a/.gitea/workflows/release-cron.yml
+++ b/.gitea/workflows/release-cron.yml
@@ -19,7 +19,7 @@ jobs:
 
     - name: Run cleanup script
       env:
-        AZURE_BLOBSTORE_TOKEN: "{{ secrets.AZURE_BLOBSTORE_TOKEN }}"
+        AZURE_BLOBSTORE_TOKEN: ${{ secrets.AZURE_BLOBSTORE_TOKEN }}
       run: |
         go run build/ci.go purge -store gethstore/builds -days 14
 
@@ -41,8 +41,8 @@ jobs:
 
     - name: Run ci.go
       env:
-        PPA_SIGNING_KEY: "{{ secrets.PPA_SIGNING_KEY }}"
-        PPA_SSH_KEY: "{{ secrets.PPA_SSH_KEY }}"
+        PPA_SIGNING_KEY: ${{ secrets.PPA_SIGNING_KEY }}
+        PPA_SSH_KEY: ${{ secrets.PPA_SSH_KEY }}
       run: |
         echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
         go run build/ci.go debsrc -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <geth-ci@ethereum.org>"
diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 29154c6ef0..7675c75e16 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -19,18 +19,18 @@ jobs:
 
     - name: Run build (amd64)
       env:
-        LINUX_SIGNING_KEY: "{{ secrets.LINUX_SIGNING_KEY }}"
+        LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
       run: |
         go run build/ci.go install -arch amd64 -dlgo
-        go run build/ci.go archive -arch amd64 -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
+        go run build/ci.go archive -arch amd64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
 
     - name: Run build (386)
       env:
-        LINUX_SIGNING_KEY: "{{ secrets.LINUX_SIGNING_KEY }}"
+        LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
       run: |
         apt-get -yq --no-install-suggests --no-install-recommends install gcc-multilib
         go run build/ci.go install -arch 386 -dlgo
-        go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
+        go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
 
   linux-arm:
     name: Linux Build (arm)
@@ -51,34 +51,34 @@ jobs:
 
     - name: Run build (arm64)
       env:
-        LINUX_SIGNING_KEY: "{{ secrets.LINUX_SIGNING_KEY }}"
+        LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
       run: |
         go run build/ci.go install -dlgo -arch arm64 -cc arm-linux-gnueabi-gcc
-        go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
+        go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
 
     - name: Run build (armv5)
       env:
         GOARM: "5"
-        LINUX_SIGNING_KEY: "{{ secrets.LINUX_SIGNING_KEY }}"
+        LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
       run: |
         go run build/ci.go install -dlgo -arch arm -cc arm-linux-gnueabi-gcc
-        go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
+        go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
 
     - name: Run build (armv6)
       env:
         GOARM: "6"
-        LINUX_SIGNING_KEY: "{{ secrets.LINUX_SIGNING_KEY }}"
+        LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
       run: |
         go run build/ci.go install -dlgo -arch arm -cc arm-linux-gnueabi-gcc
-        go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
+        go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
 
     - name: Run build (armv7)
       env:
         GOARM: "7"
-        LINUX_SIGNING_KEY: "{{ secrets.LINUX_SIGNING_KEY }}"
+        LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
       run: |
         go run build/ci.go install -dlgo -arch arm -cc arm-linux-gnueabi-gcc
-        go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
+        go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
 
   docker:
     name: Docker Image
@@ -100,7 +100,7 @@ jobs:
 
     - name: Run docker build
       env:
-        DOCKER_HUB_USERNAME: "{{ secrets.DOCKER_HUB_USERNAME }}"
-        DOCKER_HUB_PASSWORD: "{{ secrets.DOCKER_HUB_PASSWORD }}"
+        DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+        DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
       run: |
         go run build/ci.go dockerx -platform linux/amd64,linux/arm64,linux/riscv64 -upload