diff --git a/build.sh b/build.sh
deleted file mode 100755
index 4daa308..0000000
--- a/build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-go build .
-sudo docker build . -t lbry/hub:latest
diff --git a/build_and_push.sh b/build_and_push.sh
new file mode 100755
index 0000000..23de702
--- /dev/null
+++ b/build_and_push.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Get new tags from remote
+git fetch --tags
+
+# Get latest tag name
+latestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
+
+# Checkout latest tag
+git checkout $latestTag
+
+go build .
+docker build . -t lbry/hub:latest
+docker tag lbry/hub:latest lbry/hub:$latestTag
+docker push lbry/hub:latest
+docker push lbry/hub:$latestTag