diff --git a/docker.properties b/docker.properties
index 389e2d30c9b..c030f87a78c 100644
--- a/docker.properties
+++ b/docker.properties
@@ -1 +1 @@
-DOCKER_IMAGE_TAG=202105171514
+DOCKER_IMAGE_TAG=202105271710
diff --git a/tools/chef/cookbooks/pixielabs/recipes/base.rb b/tools/chef/cookbooks/pixielabs/recipes/base.rb
index 1aef78699c8..206d59c8013 100644
--- a/tools/chef/cookbooks/pixielabs/recipes/base.rb
+++ b/tools/chef/cookbooks/pixielabs/recipes/base.rb
@@ -55,6 +55,24 @@
   action :create
 end
 
+directory '/opt/pixielabs/gopath' do
+  owner user
+  group root_group
+  mode '0755'
+  action :create
+end
+
+execute 'install go binaries' do
+  ENV['GOPATH'] = "/opt/pixielabs/gopath"
+  command %(go get \
+            golang.org/x/lint/golint@v0.0.0-20210508222113-6edffad5e616 \
+            golang.org/x/tools/cmd/goimports@v0.1.2 \
+            github.com/golang/mock/mockgen@v1.5.0 \
+            github.com/cheekybits/genny@v1.0.0 \
+            sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 \
+            github.com/go-bindata/go-bindata/go-bindata@v3.1.2+incompatible)
+end
+
 template '/opt/pixielabs/plenv.inc' do
   source 'plenv.inc.erb'
   owner user
@@ -103,7 +121,6 @@
   action :delete
 end
 
-
 remote_file '/opt/pixielabs/bin/prototool' do
   source node['prototool']['download_path']
   mode 0755
@@ -170,7 +187,6 @@
   action :delete
 end
 
-
 directory '/opt/antlr' do
   owner user
   group root_group
diff --git a/tools/chef/cookbooks/pixielabs/recipes/docker_extras.rb b/tools/chef/cookbooks/pixielabs/recipes/docker_extras.rb
index 9662f482570..22f67c3a81c 100644
--- a/tools/chef/cookbooks/pixielabs/recipes/docker_extras.rb
+++ b/tools/chef/cookbooks/pixielabs/recipes/docker_extras.rb
@@ -23,11 +23,3 @@
   mode '0755'
   action :create
 end
-
-execute 'Install golint' do
-  command 'go get -u golang.org/x/lint/golint'
-end
-
-execute 'Install goimports' do
-  command 'go get -u golang.org/x/tools/cmd/goimports'
-end
diff --git a/tools/chef/cookbooks/pixielabs/templates/plenv.inc.erb b/tools/chef/cookbooks/pixielabs/templates/plenv.inc.erb
index ca0cfc107ef..6befe2655b8 100644
--- a/tools/chef/cookbooks/pixielabs/templates/plenv.inc.erb
+++ b/tools/chef/cookbooks/pixielabs/templates/plenv.inc.erb
@@ -7,6 +7,7 @@ export PATH=/opt/node/bin:$PATH
 export PATH=/opt/phab/arcanist/bin:$PATH
 export PATH=${CLANG_PATH}/bin:$PATH
 export PATH=/opt/golang/bin:$PATH
+export PATH=/opt/pixielabs/gopath/bin:$PATH
 export LD_LIBRARY_PATH=${CLANG_PATH}/lib:${LD_LIBRARY_PATH}
 
 export CC=clang