diff --git a/.github/workflows/build-master.yaml b/.github/workflows/build-master.yaml
new file mode 100644
index 0000000..5e5ecf1
--- /dev/null
+++ b/.github/workflows/build-master.yaml
@@ -0,0 +1,40 @@
+# Regarding build steps, this is a copy of the Dockerfile and should be kept in-sync
+name: "Build pumptools"
+
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: "ubuntu-20.04"
+    steps:
+      - name: "Checkout repository"
+        uses: "actions/checkout@v2"
+
+      # Building bootstrapped using docker containers
+      - name: "Install prerequisites"
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y runc containerd docker.io
+      
+      - name: "Build"
+        run: |
+          make build-docker
+
+      # Do some unpacking of the dist zip. Artifact upload repackages stuff
+      - name: "Prepare artifact package"
+        run: |
+          mkdir artifact
+          cd artifact
+          unzip ../build/docker/pumptools-public.zip
+          cd ..
+
+      - name: "Upload artifact"
+        uses: "actions/upload-artifact@v2"
+        with:
+          name: pumptools-${{ github.sha }}
+          retention-days: 30
+          if-no-files-found: "error"
+          path: |
+            artifact/**
diff --git a/.github/workflows/build.yaml b/.github/workflows/build-tag.yaml
similarity index 74%
rename from .github/workflows/build.yaml
rename to .github/workflows/build-tag.yaml
index 8a71f2a..e545a0f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build-tag.yaml
@@ -3,17 +3,8 @@ name: "Build pumptools"
 
 on:
   push:
-    branches:
-      - ci-github
-  release:
-    types:
-      - created
-  workflow_dispatch: # allows you to trigger manually
-
-# TODO check github actions doc to evaluate if we need this or if this is even a good idea
-# concurrency:
-#   group: ${{ github.workflow }}-${{ github.ref }}
-#   cancel-in-progress: true
+    tags:
+      - "*.*"
 
 jobs:
   build:
@@ -44,8 +35,7 @@ jobs:
         uses: "actions/upload-artifact@v2"
         with:
           name: pumptools-${{ github.sha }}
-          # TODO change this back to 30
-          retention-days: 1
+          retention-days: 30
           if-no-files-found: "error"
           path: |
             artifact/**
@@ -60,6 +50,16 @@ jobs:
         with:
           name: pumptools-${{ github.sha }}
 
+      - name: "Get the version"
+        id: get_version
+        run: |
+          echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+
+      # The publish release action does not package the artifact *sigh*
+      - name: "Create release package"
+        run: |
+          zip pumptools-${{ steps.get_version.outputs.VERSION }}.zip *
+
       - name: "Publish release"
         uses: "marvinpinto/action-automatic-releases@v1.2.1"
         with:
@@ -67,6 +67,6 @@ jobs:
           automatic_release_tag: "latest"
           draft: false
           prerelease: true
-          title: master ${{ github.sha }}
+          title: ${{ steps.get_version.outputs.VERSION }}
           files: |
-            **
+            pumptools-${{ steps.get_version.outputs.VERSION }}.zip