diff --git a/.github/workflows/docker.yml b/.github/workflows/build.yml
similarity index 94%
rename from .github/workflows/docker.yml
rename to .github/workflows/build.yml
index 358ac99..c56329d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/build.yml
@@ -1,10 +1,10 @@
-name: Docker Build
+name: build
 
 on:
   push:
     branches:
       - "*"
-  push_request:
+  pull_request:
     branches:
       - "*"
 
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
deleted file mode 100644
index f709425..0000000
--- a/.github/workflows/go.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Go
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.13
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-
-    - name: Build
-      run: go build -v ./...
-
-    - name: Test
-      run: go test -v ./...
diff --git a/.github/workflows/docker-tagged.yml b/.github/workflows/publish.yml
similarity index 80%
rename from .github/workflows/docker-tagged.yml
rename to .github/workflows/publish.yml
index e9ed056..39464b1 100644
--- a/.github/workflows/docker-tagged.yml
+++ b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: Docker Tagged Build
+name: publish
 
 on:
   push:
@@ -40,7 +40,7 @@ jobs:
         with:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
-          tags: ghcr.io/openfaas/nats-connector:${{ steps.get_tag.outputs.TAG }}
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+          tags: |
+            ghcr.io/openfaas/nats-connector:${{ github.sha }}
+            ghcr.io/openfaas/nats-connector:${{ steps.get_tag.outputs.TAG }}
+            ghcr.io/openfaas/nats-connector:latest