diff --git a/ManuSurface/setup.sh b/ManuSurface/setup.sh
index c8e55d57..48bf4919 100755
--- a/ManuSurface/setup.sh
+++ b/ManuSurface/setup.sh
@@ -53,9 +53,9 @@ flatpak install -y flathub com.github.wwmm.easyeffects
 # Install equalizer
 source "$popOSRoot/equalizer/install.sh"
 
-# Install Steam
-sudo apt install -y steam
-
 # Git config
 git config --global user.name "Manuel Thalmann"
 git config --global user.email "m@nuth.ch"
+
+# Install General Packages from APT
+source "$softwareRoot/apt-packages.sh"
diff --git a/scripts/PopOS/software/apt-packages.sh b/scripts/PopOS/software/apt-packages.sh
new file mode 100755
index 00000000..a1d6e834
--- /dev/null
+++ b/scripts/PopOS/software/apt-packages.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# Elevate script
+if [ ! "$UID" -eq 0 ]
+then
+    sudo bash "$BASH_SOURCE"
+else
+    apt install -y steam vim docker.io
+fi