diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1515ae1723..ffb7d399d0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -78,15 +78,11 @@ jobs:
       - setup_remote_docker:
           version: 17.10.0-ce
       # Build and push docker image
-      - run: docker build --build-arg git_tag=$(git describe --tags) --build-arg git_commit=$(git rev-parse HEAD) -f Dockerfile -t oryd/hydra:$CIRCLE_TAG .
-      - run: docker build --build-arg git_tag=$(git describe --tags) --build-arg git_commit=$(git rev-parse HEAD) -f Dockerfile-alpine -t oryd/hydra:$CIRCLE_TAG-alpine .
-      - run: docker tag oryd/hydra:$CIRCLE_TAG oryd/hydra:latest
-      - run: docker tag oryd/hydra:$CIRCLE_TAG-alpine oryd/hydra:latest-alpine
+      - run: docker build --build-arg git_tag=$(git describe --tags) --build-arg git_commit=$(git rev-parse HEAD) -f Dockerfile -t oryd/hydra:$(echo $CIRCLE_TAG | tr '+' '_') .
+      - run: docker build --build-arg git_tag=$(git describe --tags) --build-arg git_commit=$(git rev-parse HEAD) -f Dockerfile-alpine -t oryd/hydra:$(echo $CIRCLE_TAG | tr '+' '_')-alpine .
       - run: docker login --username "$DOCKER_USERNAME" --password "$DOCKER_PASSWORD"
-      - run: docker push oryd/hydra:$CIRCLE_TAG
-      - run: docker push oryd/hydra:$CIRCLE_TAG-alpine
-      - run: docker push oryd/hydra:latest-alpine
-      - run: docker push oryd/hydra:latest-alpine
+      - run: docker push oryd/hydra:$(echo $CIRCLE_TAG | tr '+' '_')
+      - run: docker push oryd/hydra:$(echo $CIRCLE_TAG | tr '+' '_')-alpine
 
   release-npm:
     docker:
@@ -97,9 +93,7 @@ jobs:
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
       - run: |
           npm version -f --no-git-tag-version $CIRCLE_TAG
-      - run: npm view ory-hydra-sdk
-      - run: npm whoami
-      - run: npm publish
+      - run: npm publish --access public
 
   release-binaries:
     docker:
diff --git a/package.json b/package.json
index be0c26e32e..b317deaacc 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ory-hydra-sdk",
+  "name": "@oryd/hydra",
   "version": "0.0.0",
   "description": "The official JavaScript / NodeJS SDK for ORY Hydra.",
   "license": "Apache-2.0",