diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8835162d5e4..761d123abb9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,6 +45,12 @@ jobs:
     working_directory: /go/src/github.com/ory/hydra
     steps:
       - checkout
+      - setup_remote_docker
+      - run:
+          command: |
+            ./.circleci/release_name.bash
+            echo 'export DOCKER_SHORT_TAG=$CIRCLE_SHA1' >> $BASH_ENV
+            source $BASH_ENV
       - run: GO111MODULE=off go get github.com/mattn/goveralls github.com/ory/go-acc
       - restore_cache:
           keys:
@@ -58,6 +64,7 @@ jobs:
       #      Running race conditions requires parallel tests, otherwise it's worthless (which is the case)
       #      - run: go test -race -short $(go list ./... | grep -v cmd)
       - run: test -z "$CIRCLE_PR_NUMBER" && goveralls -service=circle-ci -coverprofile=coverage.txt -repotoken=$COVERALLS_REPO_TOKEN || echo "forks are not allowed to push to coveralls"
+      - run: curl -sL https://git.io/goreleaser | bash -s -- --snapshot --skip-publish --rm-dist
 
   test-e2e-memory:
     docker:
@@ -388,7 +395,6 @@ jobs:
             source $BASH_ENV
       - setup_remote_docker
       - run: docker login --username "$DOCKER_USERNAME" --password "$DOCKER_PASSWORD"
-      - run: cp ./.releaser/LICENSE.txt ./LICENSE.txt
       - run: curl -sL https://git.io/goreleaser | bash
 
 workflows:
diff --git a/.circleci/release_name.bash b/.circleci/release_name.bash
index 300e0a43848..20c106fc6a2 100755
--- a/.circleci/release_name.bash
+++ b/.circleci/release_name.bash
@@ -1,11 +1,13 @@
-#!/bin/bash
-
-release=$(curl -s "https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/releases")
-tag=$(echo ${release} | jq -r ".[0].tag_name")
-tag_name=$(echo ${release} | jq -r ".[0].name")
-
-if [[ -n "$tag_name" ]]; then
-    echo "export RELEASE_NAME=$tag_name" >> $BASH_ENV
-else
-    echo "export RELEASE_NAME=$tag" >> $BASH_ENV
-fi
+#!/bin/bash
+
+release=$(curl -s "https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/releases")
+tag=$(echo ${release} | jq -r ".[0].tag_name")
+tag_name=$(echo ${release} | jq -r ".[0].name")
+
+if [[ -n "$tag_name" ]]; then
+    echo "export RELEASE_NAME=$tag_name" >> $BASH_ENV
+elif [[ -n "$tag" ]]; then
+    echo "export RELEASE_NAME=$tag" >> $BASH_ENV
+else
+    echo "export RELEASE_NAME=$CIRCLE_SHA1" >> $BASH_ENV
+fi
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 3fc1c93d7bb..f07608136f3 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -8,13 +8,14 @@ env:
 before:
   hooks:
     - go mod download
+    - cp ./.releaser/LICENSE.txt ./LICENSE.txt
 
 builds:
   -
     flags:
       - -a
     ldflags:
-      - -s -w -X github.com/ory/hydra/cmd.Version={{.Tag}} -X github.com/ory/hydra/cmd.Commit={{.FullCommit}} -X github.com/ory/hydra/cmd.Date={{.Date}}
+      - -s -w -X github.com/ory/hydra/cmd.Version={{.Env.RELEASE_NAME}} -X github.com/ory/hydra/cmd.Commit={{.FullCommit}} -X github.com/ory/hydra/cmd.Date={{.Date}}
     binary: hydra
     env:
       - CGO_ENABLED=0
@@ -33,7 +34,7 @@ builds:
       - windows
       - darwin
 
-archive:
+archives:
   -
     replacements:
       darwin: macOS