diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 6959d6ae..b22d4cd3 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -7,6 +7,7 @@ jobs:
 
   publish-docker:
     runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
     steps:
       - uses: actions/checkout@master
         with:
@@ -20,13 +21,14 @@ jobs:
       - name: Upload to Docker
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: jib -Pdocker=drpcorg
+          arguments: jib -Pdocker=drpcorg -Pbuild_version=${{ github.ref_name }}
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
   publish-github:
     runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
     steps:
       - uses: actions/checkout@master
         with:
@@ -39,7 +41,7 @@ jobs:
       - name: Build zip
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: distZip
+          arguments: distZip -Pbuild_version=${{ github.ref_name }}
       - name: Upload Release
         id: upload-release-asset
         uses: svenstaro/upload-release-action@v1-release
diff --git a/build.gradle b/build.gradle
index 74f768c2..1c7e1918 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ group = 'io.emeraldpay.dshackle'
 // Version schema:
 //    x.x.x for production, following SemVer model
 //    x.x.x-SNAPSHOT for development
-version = '0.30.0-SNAPSHOT'
+version =  project.hasProperty('build_version') ? project.property('build_version') : "0.0.1-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17