diff --git a/.profile.roku b/.profile.roku
index e666d82..4f564c5 100644
--- a/.profile.roku
+++ b/.profile.roku
@@ -22,6 +22,22 @@ target:
 EOF
 }
 
+complete -F build_completion build
+build_completion()
+{
+    local CANDIDATES="help clobber tests addon-checksums icecc docker make"
+
+    # Platforms
+    local PLATFORMS="native marlin bailey loggan"
+    if ! [[ "${COMP_WORDS[*]}" =~ "marlin" ||
+            "${COMP_WORDS[*]}" =~ "bailey" ||
+            "${COMP_WORDS[*]}" =~ "loggan"  ||
+            "${COMP_WORDS[*]}" =~ "native" ]]; then
+        CANDIDATES+=" $PLATFORMS"
+    fi
+
+    COMPREPLY=($(compgen -W "$CANDIDATES" "${COMP_WORDS[${COMP_CWORD}]}"))
+}
 build()
 {
     local BUILD_PLATFORM=marlin
@@ -31,12 +47,14 @@ build()
     local BUILD_MODE=dev
     local PAX_DEBUG=on
     local OPTIONS=
+    local DOCKER=0
 
-    local BUILD_ROOT=$(git rev-parse --show-toplevel)/os
+    local REPO_ROOT=$(git rev-parse --show-toplevel)
     if [ "$?" -ne "0" ]; then
-        BUILD_ROOT=$(p4 -Ztag -F %clientRoot% info)/os
+        REPO_ROOT=$(p4 -Ztag -F %clientRoot% info)
     fi
-    echo $BUILD_ROOT
+    local BUILD_ROOT=$REPO_ROOT/os
+    #echo $BUILD_ROOT
 
     # args=$(getopt fhstuec $*)
     # if [ $? -ne 0 ]; then
@@ -46,19 +64,25 @@ build()
 
     while [ $# -gt 0 ]; do
         case "$1" in
+        tests|\
+        hostunittests|\
         unittests)
             TARGET=build-tests-all
             PAX_DEBUG=off
             BUILD_PLATFORM=hostunittests
             ;;
+        host|\
+        hoststatic|\
         unity|\
         native)
             PAX_DEBUG=off
             BUILD_PLATFORM=$1
+            DOCKER=1
             ;;
         reno|\
         bailey|\
         marlin|\
+        loggan|\
         madison)
             BUILD_PLATFORM=$1
             ;;
@@ -91,6 +115,12 @@ build()
         nopax)
             PAX_DEBUG=off
             ;;
+        make)
+            DOCKER=0
+            ;;
+        docker)
+            DOCKER=1
+            ;;
         debug)
             BUILD_MODE=dbg
             ;;
@@ -107,15 +137,26 @@ build()
     done
 
 
-    make \
-        ENABLE_ICECC=$ENABLE_ICECC \
-        BUILD_MODE=$BUILD_MODE \
-        PAX_DEBUG=$PAX_DEBUG \
-        BUILD_PLATFORM=$BUILD_PLATFORM \
-        $OPTIONS \
-        -j $JOBS \
-        -C $BUILD_ROOT $TARGET
-    #make ENABLE_ICECC=1 PAX_DEBUG=on BUILD_PLATFORM=$1 -j $(nproc) -C os all 
+    if [ $DOCKER -eq 1 ]; then
+        $REPO_ROOT/os/scripts/docker/localcontainer/docker-u20-make \
+            ENABLE_ICECC=$ENABLE_ICECC \
+            BUILD_MODE=$BUILD_MODE \
+            PAX_DEBUG=$PAX_DEBUG \
+            BUILD_PLATFORM=$BUILD_PLATFORM \
+            $OPTIONS \
+            -j $JOBS \
+            -C $BUILD_ROOT $TARGET
+    else
+        make \
+            ENABLE_ICECC=$ENABLE_ICECC \
+            BUILD_MODE=$BUILD_MODE \
+            PAX_DEBUG=$PAX_DEBUG \
+            BUILD_PLATFORM=$BUILD_PLATFORM \
+            $OPTIONS \
+            -j $JOBS \
+            -C $BUILD_ROOT $TARGET
+        #make ENABLE_ICECC=1 PAX_DEBUG=on BUILD_PLATFORM=$1 -j $(nproc) -C os all
+    fi
 }
 ###############################################################################
 #