diff --git a/mitamae/configuration.rb b/mitamae/configuration.rb
index 554d511..22b077c 100644
--- a/mitamae/configuration.rb
+++ b/mitamae/configuration.rb
@@ -40,3 +40,14 @@
   checksum node[:vim_plug_checksum]
   user node[:login_user]
 end
+
+directory "/home/#{node[:login_user]}/Code/thoughtworks" do
+  mode '0755'
+  user node[:login_user]
+end
+
+remote_file "/home/#{node[:login_user]}/Code/thoughtworks/gitconfig" do
+  source 'files/tw_gitconfig'
+  mode '0644'
+  user node[:login_user]
+end
diff --git a/mitamae/files/tw_gitconfig b/mitamae/files/tw_gitconfig
new file mode 100644
index 0000000..b1d61f9
--- /dev/null
+++ b/mitamae/files/tw_gitconfig
@@ -0,0 +1,6 @@
+[user]
+  email = mheiber@thoughtworks.com
+  name = Moritz Heiber
+  signingkey = F75C32B1
+[commit]
+  gpgsign = true
diff --git a/mitamae/packages.rb b/mitamae/packages.rb
index b325f15..97fcab8 100644
--- a/mitamae/packages.rb
+++ b/mitamae/packages.rb
@@ -67,7 +67,7 @@
 end
 
 # Install golang separately to we can keep track of the version
-package "golang-#{node[:golang_version]}"
+package 'golang-go'
 
 # Remove a couple of apt packages
 %w(
diff --git a/mitamae/repos.rb b/mitamae/repos.rb
index 7fa773c..eee60bd 100644
--- a/mitamae/repos.rb
+++ b/mitamae/repos.rb
@@ -18,7 +18,7 @@
   gencfsm/ppa
   neovim-ppa/stable
   numix/ppa
-  gophers/archive
+  longsleep/golang-backports
   git-core/ppa
   yubico/stable
 ).each do |u|