diff --git a/Dockerfile.deploy b/Dockerfile.deploy
index 68704feb2907d69c9064d324ed90c41db89db772..c264cef4a2d67273b3140331791a9a6e78d84ef2 100644
--- a/Dockerfile.deploy
+++ b/Dockerfile.deploy
@@ -4,12 +4,12 @@ MAINTAINER Monax <support@monax.io>
 ENV TARGET eris-db
 
 # runtime customization start here
-ADD ./eris-client $INSTALL_BASE
+COPY ./eris-client $INSTALL_BASE/eris-client
 COPY ./bin/start_eris_db $INSTALL_BASE/erisdb-wrapper
 # runtime customization end here
 
 # Get the binary from the artifact in pwd
-ADD ./$TARGET $INSTALL_BASE
+COPY ./"$TARGET"_build_artifact $INSTALL_BASE/$TARGET
 RUN chmod +x --recursive $INSTALL_BASE
 
 # Finalize
diff --git a/tests/build_tool.sh b/tests/build_tool.sh
index b51f4b1159a6bcfbac6094f62445e77e39248b09..008f3cc35c101457f7c1ec9f976e97773f29cb8f 100755
--- a/tests/build_tool.sh
+++ b/tests/build_tool.sh
@@ -36,17 +36,13 @@ release_maj=$(echo $release_min | cut -d . -f 1-2)
 
 # Build
 docker build -t $IMAGE:build $REPO
-docker run --rm --entrypoint cat $IMAGE:build /usr/local/bin/$TARGET > $REPO/$TARGET
+docker run --rm --entrypoint cat $IMAGE:build /usr/local/bin/$TARGET > $REPO/"$TARGET"_build_artifact
 docker run --rm --entrypoint cat $IMAGE:build /usr/local/bin/eris-client > $REPO/eris-client
 docker build -t $IMAGE:$release_min -f Dockerfile.deploy $REPO
 
 # Cleanup
 rm $REPO/$TARGET
 rm $REPO/eris-client
-if [ "$CI" ]
-then
-  docker rmi $IMAGE:build
-fi
 
 # Extra Tags
 if [[ "$branch" = "master" ]]