diff --git a/Makefile b/Makefile
index 76dfa9b..8420924 100644
--- a/Makefile
+++ b/Makefile
@@ -45,12 +45,6 @@ else
 	# 	- `strip -s` is like passing '-s' flag to -ldflags, but it doesn't strip quite as much
 endif
 
-# Set static build option
-#   Usage: STATIC=1 make
-ifeq ($(STATIC),true)
-	GO_LDFLAGS := $(GO_LDFLAGS) -extldflags -static
-endif
-
 # Verbose
 VERBOSE_GO := -v
 
@@ -69,6 +63,10 @@ export GOOS=darwin
 # Support go1.5 vendoring (let us avoid messing with GOPATH or using godep)
 export GO15VENDOREXPERIMENT=1
 
+# TODO: uuid.go need cgo
+export CGO_ENABLED=1
+
+
 # Package side settings
 
 # Build package infomation
@@ -157,4 +155,4 @@ test-stop:
 test-upgrade:
 test-url:
 
-.PHONY: clean run kill
+.PHONY: clean run rm kill
diff --git a/mk/driver.mk b/mk/driver.mk
index f928cb7..e195860 100644
--- a/mk/driver.mk
+++ b/mk/driver.mk
@@ -2,7 +2,7 @@ MAKEFLAGS := -j 1
 
 DOCKER_MACHINE_CMD := docker-machine
 
-DOCKER_MACHINE_STORAGEPATH := $(HOME)/.docker/machine-test
+DOCKER_MACHINE_STORAGEPATH := $(HOME)/.docker/machine
 DOCKER_MACHINE_VM_NAME := xhyve-test
 # Set boot2docker-url to already exists iso path
 DOCKER_MACHINE_VM_BOOT2DOCKER_URL := $(HOME)/.docker/machine/cache/boot2docker.iso
@@ -10,7 +10,7 @@ DOCKER_MACHINE_VM_BOOT2DOCKER_URL := $(HOME)/.docker/machine/cache/boot2docker.i
 DOCKER_MACHINE_VM_CPU_COUNT := ${shell /usr/bin/python -c "print(${shell sysctl -n hw.ncpu}/2)"}
 # Set memory size to hw.memsize/2 MB
 DOCKER_MACHINE_VM_MEMORY_SIZE := ${shell /usr/bin/python -c "print(${shell sysctl -n hw.memsize}/2097152)"}
-DOCKER_MACHINE_VM_DISKSIZE := 2000
+DOCKER_MACHINE_VM_DISKSIZE := 20000
 
 # Always enable debug mode
 export MACHINE_DEBUG=1