diff --git a/ManuSurface/ManuSurfaceSetup.md b/ManuSurface/ManuSurfaceSetup.md
index 0a8eb958..dcfe83e7 100644
--- a/ManuSurface/ManuSurfaceSetup.md
+++ b/ManuSurface/ManuSurfaceSetup.md
@@ -36,21 +36,9 @@ The steps described here allow the creation of a linux system on a Surface Book
     - Using [installer script](../scripts/PopOS/equalizer/install.sh)
 
   - Install python
-    ```bash
-    sudo apt install python3 python-is-python3 python3-pip
-    ```
-  - Install pyenv  
-    ```bash
-    curl https://pyenv.run | bash
-    {
-      echo ""
-      echo "# pyenv"
-      echo 'export PYENV_ROOT="$HOME/.pyenv"'
-      echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"'
-      echo 'eval "$(pyenv init -)"'
-      echo 'eval "$(pyenv virtualenv-init -)"'
-    } >> ~/.bashrc
-    ```
+    - Using [installer script](../scripts/PopOS/software/python.sh)
+  - Install pyenv
+    - Using [installer script](../scripts/PopOS/software/pyenv.sh)
 
 ## Post-Install
   - Add SSH-key to GitHub/Gitea websites
diff --git a/scripts/PopOS/software/pyenv.sh b/scripts/PopOS/software/pyenv.sh
new file mode 100644
index 00000000..11e251ab
--- /dev/null
+++ b/scripts/PopOS/software/pyenv.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+curl https://pyenv.run | bash
+{
+    echo ""
+    echo "# pyenv"
+    echo 'export PYENV_ROOT="$HOME/.pyenv"'
+    echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"'
+    echo 'eval "$(pyenv init -)"'
+    echo 'eval "$(pyenv virtualenv-init -)"'
+} >> ~/.bashrc
diff --git a/scripts/PopOS/software/python.sh b/scripts/PopOS/software/python.sh
new file mode 100644
index 00000000..d7604bc5
--- /dev/null
+++ b/scripts/PopOS/software/python.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+# Elevate script
+if [ ! "$UID" -eq 0 ]
+then
+    exec sudo bash "$0"
+fi
+
+apt install python3 python-is-python3 python3-pip
+pip install pipenv