diff --git a/playbook.yml b/playbook.yml
index 533de88..b035ce5 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -494,7 +494,7 @@
         when: not yubikey_touch_detector_binary.stat.exists
 
       - name: build yubikey-touch-detector
-        shell: env GOPATH=$(pwd) go get -u github.com/maximbaz/yubikey-touch-detector
+        shell: env GOPATH=$(pwd) GOPATH=/usr/local/go/bin go get -u github.com/maximbaz/yubikey-touch-detector
         args:
           chdir: "{{ yubikey_touch_detector_build_tempdir.path }}"
         when: not yubikey_touch_detector_binary.stat.exists
diff --git a/user.yml b/user.yml
index 33e0f5c..4dc9b50 100644
--- a/user.yml
+++ b/user.yml
@@ -319,7 +319,7 @@
     changed_when: false
 
   - name: install go binaries for vim
-    command: /usr/bin/nvim --headless +GoInstallBinaries +qall
+    command: sh -c 'PATH=/usr/local/go/bin:$PATH GOPATH=/home/{{ user.name }}/.go /usr/bin/nvim --headless +GoInstallBinaries +qall'
     changed_when: false
 
   - name: update vim plugins
@@ -327,7 +327,7 @@
     changed_when: false
 
   - name: update go binaries for vim
-    command: /usr/bin/nvim --headless +GoUpdateBinaries +qall
+    command: sh -c 'PATH=/usr/local/go/bin:$PATH GOPATH=/home/{{ user.name }}/.go /usr/bin/nvim --headless +GoUpdateBinaries +qall'
     changed_when: false
 
   - name: get ycm version after update