diff --git a/.travis.yml b/.travis.yml
index f9a7e31..2ae58ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 os: osx
-osx_image: xcode8.3
+osx_image: xcode10.1
 
 language: go
 go:
-  - 1.8.x
+  - 1.11.x
   - tip
 
 env:
@@ -25,7 +25,7 @@ before_install:
   # for ocaml-qcow
   - brew install https://github.com/Homebrew/homebrew-core/raw/master/Formula/opam.rb
   - brew install https://github.com/Homebrew/homebrew-core/raw/master/Formula/libev.rb
-  - opam --version && opam init && opam install uri qcow-format io-page.1.6.1 ocamlfind conf-libev
+  - opam --version && opam init && opam install uri qcow-format io-page ocamlfind conf-libev
   - eval `opam config env`
 
 install:
diff --git a/Makefile b/Makefile
index 8216d8f..1d97971 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ endif
 # Package settings
 
 # Build package infomation
-GITHUB_USER := zchee
+GITHUB_USER := machine-drivers
 TOP_PACKAGE_DIR := github.com/${GITHUB_USER}
 PACKAGE := $(shell basename $(PWD))
 OUTPUT := bin/docker-machine-driver-xhyve
diff --git a/glide.lock b/glide.lock
index 8c9831b..74ffd15 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: d35f4c0286fb07f6ca4356fa997095df46d74eba662956a6566abafd37d81213
-updated: 2017-06-29T14:50:19.010643722+05:30
+hash: b8e63bc050e74b744d715425dae2f7f286f33f6a8b9089981cda8f470907319d
+updated: 2019-02-02T13:46:39.946777+05:30
 imports:
 - name: github.com/docker/docker
   version: a8a31eff10544860d2188dddabdee4d727545796
@@ -28,6 +28,12 @@ imports:
 - name: github.com/pkg/errors
   version: a887431f7f6ef7687b556dbf718d9f351d4858a0
   repo: https://github.com/pkg/errors
+- name: github.com/zchee/docker-machine-driver-xhyve
+  version: 829c0968dac18547636f3ad6aa5ef83677f48267
+  subpackages:
+  - b2d
+  - vmnet
+  - xhyve
 - name: github.com/zchee/go-qcow2
   version: 9a991fd172f0e8a2a3adfe529ff5e6b814e26b97
   subpackages:
diff --git a/glide.yaml b/glide.yaml
index 4284d49..1ae6b1a 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,4 +1,4 @@
-package: github.com/zchee/docker-machine-driver-xhyve
+package: github.com/machine-drivers/docker-machine-driver-xhyve
 import:
 - package: github.com/docker/machine
   version: v0.11.0