diff --git a/scripts/post-install.sh b/scripts/post-install.sh
index 3bc6218..1ba3f0c 100755
--- a/scripts/post-install.sh
+++ b/scripts/post-install.sh
@@ -72,7 +72,7 @@ function intune() {
   #   info "Himmelblau installed."
   #
   #   # 2. Fix PAM immediately after
-  #   sudo tee /etc/pam.d/common-auth <<'EOF'
+  #   tee /etc/pam.d/common-auth <<'EOF'
   # auth    required                              pam_env.so
   # auth    [default=1 ignore=ignore success=ok]  pam_localuser.so
   # auth    sufficient                            pam_unix.so nullok try_first_pass
@@ -80,21 +80,21 @@ function intune() {
   # auth    required                              pam_deny.so
   # EOF
   #
-  #   sudo tee /etc/pam.d/common-account <<'EOF'
+  #   tee /etc/pam.d/common-account <<'EOF'
   # account [default=1 ignore=ignore success=ok]  pam_localuser.so
   # account sufficient                            pam_unix.so
   # account sufficient                            pam_himmelblau.so ignore_unknown_user
   # account required                              pam_deny.so
   # EOF
 
-  curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >microsoft.gpg
-  sudo install -o root -g root -m 644 microsoft.gpg /etc/apt/trusted.gpg.d/
-  rm microsoft.gpg
+  apt -y install curl software-properties-common apt-transport-https
+  curl -sSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft.gpg
+  echo "deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/edge stable main" | tee /etc/apt/sources.list.d/microsoft-edge.list
+  sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft.gpg] https://packages.microsoft.com/ubuntu/$(lsb_release -rs)/prod $(lsb_release -cs) main" >> /etc/apt/sources.list.d/microsoft-ubuntu-$(lsb_release -cs)-prod.list'
 
-  sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge.list'
+  apt update
+  apt install microsoft-edge-stable intune-portal -y
 
-  sudo apt update
-  sudo apt install microsoft-edge-stable intune-portal
   echo intune >>/tmp/installer
 }
 
@@ -122,6 +122,8 @@ function displaylink_driver() {
   apt-get install -y /tmp/synaptics-keyring.deb
   apt-get update
   apt-get install -y displaylink-driver
+  systemctl start displaylink-driver.service
+  echo displaylink_driver >>/tmp/installer
 }
 
 function main() {
diff --git a/templates/user-data.tmpl b/templates/user-data.tmpl
index db6fe53..331bb9a 100644
--- a/templates/user-data.tmpl
+++ b/templates/user-data.tmpl
@@ -122,6 +122,7 @@ autoinstall:
           gtk-theme='Adwaita-dark'
 
           [org/gnome/shell]
+          disabled-extensions=['ubuntu-dock@ubuntu.com']
           enabled-extensions=['dash-to-panel@jderose9.github.com']
           disable-user-extensions=false