diff --git a/manage.sh b/manage.sh
index dd6d28035d..a3f1718061 100755
--- a/manage.sh
+++ b/manage.sh
@@ -84,12 +84,18 @@ function build-release {
 
 function usage {
     echo "UXBOX build & release manager v$REV"
-    echo "USAGE: $0 [ clean | build | run | test | release-local | release-docker | run-release ]"
+    echo "USAGE: $0 OPTION"
     echo "Options:"
-    echo "- clean           Stop and clean up docker containers"
-    echo "- build-devenv    Build docker container for development with tmux"
-    echo "- run-devenv      Run (and build if necessary) development container (frontend at localhost:3449, backend at localhost:6060)"
-    echo "- build-release   Build a 'production ready' release docker images"
+    echo "- clean                   Stop and clean up docker containers"
+    echo "- build-devenv            Build docker container for development with tmux"
+    echo "- run-devenv              Run (and build if necessary) development container (frontend at localhost:3449, backend at localhost:6060)"
+    # TODO Add unit test command(s)
+    #echo "- test                    Execute unit tests for both backend and frontend"
+    #echo "- test-frontend           Execute unit tests for frontend only"
+    #echo "- test-backend            Execute unit tests for backend only"
+    echo "- build-release           Build 'production ready' docker images for both backend and frontend"
+    echo "- build-release-frontend  Build a 'production ready' docker images for frontend only"
+    echo "- build-release-backend   Build a 'production ready' docker images for backend only"
 }
 
 case $1 in
@@ -103,12 +109,6 @@ case $1 in
     run-devenv)
         run-devenv
         ;;
-    release-docker)
-        release_image
-        ;;
-    run-release)
-        run_release
-        ;;
     build-release)
         build-release
         ;;