diff --git a/tools/dev/bin/cell-build b/tools/dev/bin/cell-build
index 3136c72..e1ba127 100755
--- a/tools/dev/bin/cell-build
+++ b/tools/dev/bin/cell-build
@@ -33,7 +33,7 @@
 git diff $baseCommit > /tmp/$baseCommit.patch
 
 # Copy patch file to the remote build machine
-scp /tmp/$baseCommit.patch $ONOS_USER@$OCN:/tmp
+scp /tmp/$baseCommit.patch $ONOS_USER@[$OCN]:/tmp
 
 ssh -t -t $ONOS_USER@$OCN "
     source ~/.bash_aliases
diff --git a/tools/test/bin/atomix-config b/tools/test/bin/atomix-config
index 84b69fe..adf4fb2 100755
--- a/tools/test/bin/atomix-config
+++ b/tools/test/bin/atomix-config
@@ -29,7 +29,7 @@
 . $ONOS_ROOT/tools/build/envDefaults
 
 node=${1:-$OCI}
-remote=$ONOS_USER@$node
+remote=$ONOS_USER@[$node]
 
 # Generate a default cluster.json from the ON* environment variables
 CDEF_FILE=/tmp/${remote}.atomix.json