diff --git a/build_image.sh b/build_image.sh
index 5d104a0..c85bb03 100755
--- a/build_image.sh
+++ b/build_image.sh
@@ -13,7 +13,7 @@ function build_base() {
         (log_error "Build Full Image failed" && exit 1)
     $DOCKER build -t git.0x7f.app/woj/ubuntu-run:latest -f scripts/ubuntu-run.Dockerfile . ||
         (log_error "Build Tiny Image failed" && exit 1)
-    popd
+    popd || exit 1
 }
 
 function push_base() {
@@ -53,9 +53,27 @@ function push_runner() {
     $DOCKER push "git.0x7f.app/woj/woj-runner:$VERSION"
 }
 
-build_base
-push_base
-build_server
-push_server
-build_runner
-push_runner
+if [ "$1" == "base" ]; then
+    build_base
+    push_base
+    exit 0
+elif [ "$1" == "server" ]; then
+    build_server
+    push_server
+    exit 0
+elif [ "$1" == "runner" ]; then
+    build_runner
+    push_runner
+    exit 0
+elif [ "$1" == "all" ]; then
+    build_base
+    push_base
+    build_server
+    push_server
+    build_runner
+    push_runner
+    exit 0
+else
+    log_error "Usage: $0 [base|server|runner|all]"
+    exit 1
+fi