diff --git a/pkgs.yml b/pkgs.yml
index 1acf63729a4f352f33148706b8439b26020f1b13..3d1b8bd7b8d85d9e6ef1822c55bb22d46c0e981e 100644
--- a/pkgs.yml
+++ b/pkgs.yml
@@ -2,11 +2,13 @@
 - hosts: all
   become: false
   vars:
+      gopath: '{{ ansible_user_dir }}/Documents/Golang'
       apt:
           - adb
           - apache2-utils
           - apt-listchanges
           - apt-xapian-index
+          - aptitude
           - bijiben
           - bluez-firmware
           - brasero
@@ -70,6 +72,7 @@
           - linux-image-amd64
           - liferea
           - luarocks
+          - lynx
           - meld
           - mythes-en-us
           - netcat-openbsd
@@ -197,11 +200,18 @@
             update_cache: yes
             cache_valid_time: 3600
 
+      - name: Create the GOPATH directory
+        file:
+            path: '{{ gopath }}'
+            state: directory
+
       - name: go get
         when: go is iterable
         command: 'go get -u {{ go|join(" ") }}'
         register: go_get
         changed_when: "'get' in go_get"
+        environment:
+            GOPATH: '{{ gopath }}'
 
       - name: gem install
         with_items: '{{ gem }}'
diff --git a/workstation.yml b/workstation.yml
index 46a8a94e9910b05d244907a8e07f8775c2334ce0..c496d821801fdae7f3ed72483d35dea9ee460496 100644
--- a/workstation.yml
+++ b/workstation.yml
@@ -58,11 +58,21 @@
         rule: allow
 
   - name: Create Docker graph directory
+    with_items:
+        - path: '{{ docker_graph_directory|basename }}'
+          owner: '{{ ansible_env.SUDO_USER }}'
+          group: '{{ ansible_env.SUDO_USER }}'
+          mode: 0o0755
+        - path: '{{ docker_graph_directory }}'
+          owner: root
+          group: root
+          mode: 0o0711
     file:
-      path: '{{ docker_graph_directory }}'
-      owner: root
-      group: root
-      mode: 0o711
+        path: '{{ item.path }}'
+        owner: '{{ item.owner }}'
+        group: '{{ item.group }}'
+        mode: '{{ item.mode }}'
+        state: directory
     notify:
     - Restart Docker