diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a1bdba49..a1f070fa 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,6 +10,7 @@ on:
     workflows: ["E2E"]
     types: [completed]
     branches: [master]
+    tags: [ 'v*.*.*' ]    
 
 jobs:
   build:
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 7da71254..6685636b 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -22,6 +22,8 @@ jobs:
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
     - name: Dep
       run: |
@@ -50,3 +52,9 @@ jobs:
     - name: Test
       run: go test -v .
       working-directory: sshpiperd
+
+    - name: create release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh release create -d --generate-notes v$NBGV_SimpleVersion
\ No newline at end of file
diff --git a/version.json b/version.json
index 2158b3fb..3d56c0f6 100644
--- a/version.json
+++ b/version.json
@@ -2,6 +2,7 @@
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
     "version": "0.7",
     "publicReleaseRefSpec": [
-        "^refs/heads/master$"
+        "^refs/heads/master$",
+        "^refs/tags/v\\d+\\.\\d+\\.\\d+"
     ]
 }
\ No newline at end of file