diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6563bf687..b102175b7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -75,11 +75,9 @@ jobs:
       - checkout
       - setup_remote_docker:
           version: 17.10.0-ce
-      - run: docker build --build-arg git_tag=$(git describe --tags) --build-arg git_commit=$(git rev-parse HEAD) -f Dockerfile -t oryd/keto:$CIRCLE_TAG .
+      - run: docker build --build-arg git_tag=$(git describe --tags) --build-arg git_commit=$(git rev-parse HEAD) -f Dockerfile -t oryd/keto:$(echo $CIRCLE_TAG | tr '+' '_') .
       - run: docker login --username "$DOCKER_USERNAME" --password "$DOCKER_PASSWORD"
-      - run: docker tag oryd/keto:$CIRCLE_TAG oryd/keto:latest
-      - run: docker push oryd/keto:$CIRCLE_TAG
-      - run: docker push oryd/keto:latest
+      - run: docker push oryd/keto:$(echo $CIRCLE_TAG | tr '+' '_')
 
   publish-docs:
     docker:
diff --git a/cmd/server/serve.go b/cmd/server/serve.go
index e6876b6bb..cd932e0dc 100644
--- a/cmd/server/serve.go
+++ b/cmd/server/serve.go
@@ -38,7 +38,7 @@ import (
 	"github.com/ory/keto/role"
 	"github.com/ory/keto/warden"
 	"github.com/ory/ladon"
-	"github.com/ory/metrics-middleware"
+	metrics "github.com/ory/metrics-middleware"
 	"github.com/rs/cors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/warden/sdk_test.go b/warden/sdk_test.go
index cc013bbea..32e53067c 100644
--- a/warden/sdk_test.go
+++ b/warden/sdk_test.go
@@ -32,6 +32,7 @@ import (
 	"github.com/ory/keto/authentication"
 	keto "github.com/ory/keto/sdk/go/keto/swagger"
 	"github.com/ory/keto/warden"
+
 	//"github.com/ory/ladon"
 	"github.com/pkg/errors"
 	//"github.com/stretchr/testify/assert"