diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile
index 67f488afb04359841dce3d5231175b094f2c4ac2..844f3ddc3eac9aa7df98870a9db75f0f766ab789 100644
--- a/DOCKER/Dockerfile
+++ b/DOCKER/Dockerfile
@@ -92,4 +92,4 @@ ENV TMROOT /home/$USER/.eris/blockchains/tendermint
 EXPOSE 1337
 EXPOSE 46656
 EXPOSE 46657
-ENTRYPOINT ["erisdb-wrapper"]
+CMD "erisdb-wrapper"
diff --git a/DOCKER/build.sh b/DOCKER/build.sh
index 819eebf92fd95f3ddbfc9223bd471a6ea70b04fd..996dbc5b7602232ffe50fdb692f81b57eb39a9e7 100755
--- a/DOCKER/build.sh
+++ b/DOCKER/build.sh
@@ -1,26 +1,28 @@
 #!/bin/sh
 
-release_maj="0.10"
-release_min="0.10.3"
+if [ "$CIRCLE_BRANCH" ]
+then
+  repo=`pwd`
+else
+  base=github.com/eris-ltd/eris-db
+  repo=$GOPATH/src/$base
+fi
+branch=${CIRCLE_BRANCH:=master}
+
+release_min=$(cat $repo/version/version.go | tail -n 1 | cut -d \  -f 4 | tr -d '"')
+release_maj=$(echo $release_min | cut -d . -f 1-2)
 
 start=`pwd`
-branch=${ERISDB_BUILD_BRANCH:=master}
-base=github.com/eris-ltd/eris-db
-repo=$GOPATH/src/$base
+image_base=quay.io/eris/erisdb
 
 cd $repo
 
-# if [ "$DEV" != "true" ]; then
-# 	git checkout $branch
-# 	git pull origin
-# fi
-
-if [ "$ERISDB_BUILD_BRANCH" = "master" ]; then
-  docker build -t eris/erisdb:latest -f DOCKER/Dockerfile .
-  docker tag -f eris/erisdb:latest eris/erisdb:$release_maj
-  docker tag -f eris/erisdb:latest eris/erisdb:$release_min
+if [ "$branch" = "master" ]; then
+  docker build -t $image_base:latest -f DOCKER/Dockerfile .
+  docker tag -f $image_base:latest $image_base:$release_maj
+  docker tag -f $image_base:latest $image_base:$release_min
 else
-  docker build -t eris/erisdb:$branch -f DOCKER/Dockerfile .
+  docker build -t $image_base:$branch -f DOCKER/Dockerfile .
 fi
 
 cd $start
diff --git a/circle.yml b/circle.yml
index db98814fad15c270dfc511080cb84043d584eb0e..61f77c31260dd178c6ccc85d030e695e928c5de5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -26,11 +26,6 @@ deployment:
   master:
     branch: master
     commands:
-      - "export ERISDB_BUILD_BRANCH=$CIRCLE_BRANCH && DOCKER/build.sh"
-      - docker push eris/erisdb:latest
-      - docker push eris/erisdb:0.10
-  develop:
-    branch: develop
-    commands:
-      - "export ERISDB_BUILD_BRANCH=$CIRCLE_BRANCH && DOCKER/build.sh"
-      - docker push eris/erisdb:develop
+      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
+      - DOCKER/build.sh
+      - docker push quay.io/eris/erisdb
diff --git a/version/version.go b/version/version.go
new file mode 100644
index 0000000000000000000000000000000000000000..2deaf3ad32b1d4de51baab5a0cbb7f9cb9ce9008
--- /dev/null
+++ b/version/version.go
@@ -0,0 +1,3 @@
+package version
+
+const VERSION = "0.10.4"