diff --git a/distribution/ubuntu/initial_config.sh b/distribution/ubuntu/initial_config.sh
index 5f3dc34..7ea1a8f 100644
--- a/distribution/ubuntu/initial_config.sh
+++ b/distribution/ubuntu/initial_config.sh
@@ -1,14 +1,7 @@
 #!/usr/bin/env bash
 
-disable_unwanted_extensions() {
-    # Disable default Ubuntu gnome extensions
-    sudo -u ${USERNAME} gnome-extensions disable ding@rastersoft.com # Desktop Icons
-}
-
 WHEEL_GROUP="sudo"
 
-disable_unwanted_extensions
-
 # Enable docker IPv4 forwarding, to allow LXD to work along it :)
 echo "net.ipv4.conf.all.forwarding=1" > /etc/sysctl.d/99-forwarding.conf
 sysctl net.ipv4.conf.all.forwarding=1 >/dev/null 2>&1
diff --git a/distribution/ubuntu/install.sh b/distribution/ubuntu/install.sh
index 27b8766..512977f 100644
--- a/distribution/ubuntu/install.sh
+++ b/distribution/ubuntu/install.sh
@@ -207,6 +207,11 @@ extra_init() {
   fi
 }
 
-extra_finish() {
-  echo -ne ""
+disable_unwanted_extensions() {
+    # Disable default Ubuntu gnome extensions
+    sudo -u ${USERNAME} gnome-extensions disable ding@rastersoft.com # Desktop Icons
+}
+
+extra_finish() {
+  disable_unwanted_extensions
 }
diff --git a/dotfiles.sh b/dotfiles.sh
index 2cd715a..980e5e4 100644
--- a/dotfiles.sh
+++ b/dotfiles.sh
@@ -6,13 +6,15 @@ install_dotfile_ifnot() {
 }
 
 echo "Installing dotfiles..."
-# cp -r --update=none ${script_dir}/dotfiles/. /home/${USERNAME}/
+sudo -u ${USERNAME} mkdir -p /home/${USERNAME}/.config/git
 cat ${script_dir}/dotfiles/.config/git/config | envsubst '$GIT_USER $EMAIL' >/home/${USERNAME}/.config/git/config
+chown ${USERNAME}:${USERNAME} /home/${USERNAME}/.config/git/config
 
 # Install bashrc if not mymachine-installed
 if ! [[ "$(head -n 1 /home/${USERNAME}/.bashrc)" = "# mymachine" ]]; then
     sudo -u ${USERNAME} cp "${script_dir}/dotfiles/.bashrc" "/home/${USERNAME}/.bashrc"
 fi
+install_dotfile_ifnot .config/prompt.sh
 
 # Install code settings depending on which code is installed
 CODE_NAME="Code - OSS"