diff --git a/Makefile b/Makefile
index b540d15b4..4276cfcb8 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,12 @@ USE_GLOBAL_NAMESPACE ?= false
 ifdef WERCKER
     # Insert swear words about mysql group replication and hostname length. Arghh..
     NEW_NAMESPACE ?= e2e-$(shell echo ${WERCKER_GIT_COMMIT} | fold -w 8 | head -n1)
-    VERSION := ${WERCKER_GIT_COMMIT}
+    VERSION ?= ${WERCKER_GIT_COMMIT}
     E2E_FUNC := e2efunc-wercker
     E2E_NON_BUFFERED_LOGS ?= false
 else
     NEW_NAMESPACE ?= e2e-${USER}
-    VERSION := ${USER}-$(shell  date +%Y%m%d%H%M%S)
+    VERSION ?= ${USER}-$(shell date +%Y%m%d%H%M%S)
     E2E_FUNC := e2efunc-docker
     E2E_NON_BUFFERED_LOGS ?= true
 endif
diff --git a/hack/release.sh b/hack/release.sh
deleted file mode 100755
index caa1b69fc..000000000
--- a/hack/release.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-# This script will pull down an existing build and tag it for release.
-# Example: SHA=492978... RELEASE=0.1.0 hack/release.sh
-
-set -e
-
-RELEASE=${RELEASE:=0.1.0}
-
-SHA=${SHA:=$(git rev-parse HEAD)}
-
-OPERATOR_IMAGE=wcr.io/oracle/mysql-operator
-AGENT_IMAGE=wcr.io/oracle/mysql-agent
-
-function do_release() {
-    echo "Creating release $RELEASE from existing version $SHA"
-
-    if git rev-parse "$RELEASE" >/dev/null 2>&1; then
-        echo "Tag $RELEASE already exists. Doing nothing."
-        exit 1
-    fi
-
-    echo "Creating images"
-    docker pull $OPERATOR_IMAGE:$SHA
-    docker tag $OPERATOR_IMAGE:$SHA $OPERATOR_IMAGE:$RELEASE
-    docker push $OPERATOR_IMAGE:$RELEASE
-
-    docker pull $AGENT_IMAGE:$SHA
-    docker tag $AGENT_IMAGE:$SHA $AGENT_IMAGE:$RELEASE
-    docker push $AGENT_IMAGE:$RELEASE
-
-    echo "Creating release tag $RELEASE"
-    git tag -a "$RELEASE" -m "Release version: $RELEASE"
-    git push --tags
-}
-
-read -r -p "Are you sure you want to release ${SHA} as ${RELEASE}? [y/N] " response
-case "$response" in
-    [yY][eE][sS]|[yY])
-        do_release
-        ;;
-    *)
-        exit
-        ;;
-esac
diff --git a/wercker.yml b/wercker.yml
index 072be261f..56e8d9ba7 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -31,6 +31,7 @@ build:
         cp -R pkg ${WERCKER_OUTPUT_DIR}/
         cp -R test ${WERCKER_OUTPUT_DIR}/
         cp -R vendor ${WERCKER_OUTPUT_DIR}/
+        cp -R hack ${WERCKER_OUTPUT_DIR}/
         cp -R mysql-operator ${WERCKER_OUTPUT_DIR}/
         cp -R .git ${WERCKER_OUTPUT_DIR}/
 
@@ -106,7 +107,7 @@ e2e-test-upgrade:
         fi
         E2E_NON_BUFFERED_LOGS=true make e2e-suite-run-upgrade
         make e2e-suite-teardown-upgrade
-        
+
 release:
   box:
     id: oraclelinux:7-slim
@@ -120,4 +121,4 @@ release:
       token: $GITHUB_TOKEN
       tag: $VERSION
       title: $VERSION
-      draft: false       
+      draft: false