diff --git a/install-extras.sh b/install-extras.sh
new file mode 100755
index 0000000..a038e32
--- /dev/null
+++ b/install-extras.sh
@@ -0,0 +1,27 @@
+set -e
+# bash-it / terminal
+source ./install-scripts/bash.sh
+source ./install-scripts/bash-it.sh
+source ./install-scripts/vim.sh
+source ./install-scripts/tmux.sh
+
+# git setup
+source ./install-scripts/git-config.sh
+source ./install-scripts/git-hooks.sh
+source ./install-scripts/git-author.sh
+
+# update cred-alert-cli
+source ./install-scripts/update-cred-alert.sh
+
+if [ "$(uname)" = "Darwin" ]; then
+	echo "Installing OSX only scripts"
+	source ./install-scripts/ide-prefs.sh
+	source ./install-scripts/iterm2.sh
+	source ./install-scripts/keyboard.sh
+	source ./install-scripts/dock.sh
+	source ./install-scripts/spectacle.sh
+else
+        source ./install-scripts/git-author-linux.sh
+fi
+
+source ./install-scripts/misc.sh
diff --git a/install.sh b/install.sh
index 042c8d2..8fb03d7 100755
--- a/install.sh
+++ b/install.sh
@@ -18,33 +18,7 @@ git pull
 git remote set-url origin git@github.com:cloudfoundry/capi-workspace
 
 source ./install-core.sh
-
-# bash-it / terminal
-source ./install-scripts/bash.sh
-source ./install-scripts/bash-it.sh
-source ./install-scripts/vim.sh
-source ./install-scripts/tmux.sh
-
-# git setup
-source ./install-scripts/git-config.sh
-source ./install-scripts/git-hooks.sh
-source ./install-scripts/git-author.sh
-
-# update cred-alert-cli
-source ./install-scripts/update-cred-alert.sh
-
-if [ "$(uname)" = "Darwin" ]; then
-	echo "Installing OSX only scripts"
-	source ./install-scripts/ide-prefs.sh
-	source ./install-scripts/iterm2.sh
-	source ./install-scripts/keyboard.sh
-	source ./install-scripts/dock.sh
-	source ./install-scripts/spectacle.sh
-else
-        source ./install-scripts/git-author-linux.sh
-fi
-
-source ./install-scripts/misc.sh
+source ./install-extras.sh
 
 # Add gem dependencies for CAPI-Workspace
 bundle