diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml
index 22b2a786bb..e74e5989a5 100644
--- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml
+++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-guacamole-linuxvm
-version: 0.6.24
+version: 0.6.25
 description: "An Azure TRE User Resource Template for Guacamole (Linux)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh
index 76f6a861de..68403b3f6e 100644
--- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh
+++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh
@@ -2,6 +2,7 @@
 
 set -o errexit
 set -o pipefail
+set -vx
 # set -o nounset
 # Uncomment this line to see each command for debugging (careful: this will show secrets!)
 # set -o xtrace
@@ -12,16 +13,18 @@ sudo rm -f /etc/apt/sources.list.d/*
 # Update apt packages from configured Nexus sources
 sudo apt-get update
 
-sudo dpkg --configure lightdm
 # Install xrdp so Guacamole can connect via RDP
 sudo apt-get install xrdp -y
 sudo adduser xrdp ssl-cert
 
 # Install desktop environment if image doesn't have one already
 if [ "${INSTALL_UI}" -eq 1 ]; then
-  sudo apt-get install xorg xfce4 xfce4-goodies dbus-x11 x11-xserver-utils -y
-  echo xfce4-session > ~/.xsession
-  sudo su - ${VM_USER} -c "echo xfce4-session > ~/.xsession"
+  sudo apt-get install -y xorg 
+  sudo apt-get install -y xfce4 
+  sudo apt-get install -y xfce4-goodies 
+  sudo apt-get install -y dbus-x11 
+  sudo apt-get install -y x11-xserver-utils
+  sudo -u ${VM_USER} -i bash -c 'echo xfce4-session > ~/.xsession'
 fi
 
 # Fix for blank screen on DSVM (/sh -> /bash due to conflict with profile.d scripts)