diff --git a/developers/Vagrantfile b/developers/Vagrantfile
index 2a93714a..a6a1285e 100644
--- a/developers/Vagrantfile
+++ b/developers/Vagrantfile
@@ -28,6 +28,9 @@ Vagrant.configure("2") do |config|
     sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
     sudo apt-get update
     sudo apt-get install -y docker-ce=${DOCKER_VERSION}
+    # Manage Docker as a non-root user
+    sudo groupadd docker
+    sudo usermod -aG docker $USER
 
     # Install Kubernetes
     export KUBE_VERSION="1.11.0"
@@ -75,7 +78,6 @@ Vagrant.configure("2") do |config|
     # install vim environment
     git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
     vim +PluginInstall +qall
-    vim +GoInstallBinaries +qall
 
     # init YouCompleteMe vim plugin
     sudo apt-get install -y python-dev python3-dev