diff --git a/.gitea/workflows/build-and-release.yml b/.gitea/workflows/build-and-release.yml
index c16488e..754cf3c 100644
--- a/.gitea/workflows/build-and-release.yml
+++ b/.gitea/workflows/build-and-release.yml
@@ -17,7 +17,7 @@ env:
 
 jobs:
   docker_build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest  # Gitea Cloud should recognize this and allocate an appropriate runner
     steps:
       - name: Checkout Erigon Pulse Repo
         uses: actions/checkout@v3
@@ -40,12 +40,12 @@ jobs:
       - name: Prepare Docker tags
         id: prep
         run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            VERSION=${{ github.event.inputs.version }}
-          elif [[ $GITEA_REF == refs/tags/* ]]; then
+          if [ "${{ gitea.event_name }}" = "workflow_dispatch" ]; then
+            VERSION=${{ gitea.event.inputs.version }}
+          elif [[ ${{ gitea.ref }} == refs/tags/* ]]; then
             VERSION=${GITEA_REF#refs/tags/}
           else
-            VERSION=$(echo $GITEA_SHA | cut -c1-7)
+            VERSION=$(echo ${{ gitea.sha }} | cut -c1-7)
           fi
           TAGS="${DOCKER_IMAGE_NAME}:${VERSION}"
           if [ "$VERSION" = "latest" ]; then
@@ -63,7 +63,7 @@ jobs:
           push: true
           tags: ${{ steps.prep.outputs.tags }}
           build-args: |
-            BUILD_DATE=${{ env.GITEA_COMMIT_TIMESTAMP }}
+            BUILD_DATE=${{ gitea.timestamp }}
             VCS_REF=${{ gitea.sha }}
             VERSION=${{ steps.prep.outputs.version }}
           cache-from: type=gha
@@ -72,7 +72,7 @@ jobs:
   create_release:
     needs: docker_build
     if: startsWith(gitea.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest  # Gitea Cloud should recognize this and allocate an appropriate runner
     steps:
       - name: Create Release
         run: |