diff --git a/source/resources/apps/workstations/forksand-workstation-bootstrap b/source/resources/apps/workstations/forksand-workstation-bootstrap
index 36582b5..a5df68d 100755
--- a/source/resources/apps/workstations/forksand-workstation-bootstrap
+++ b/source/resources/apps/workstations/forksand-workstation-bootstrap
@@ -233,6 +233,7 @@ apt-get -y --download-only install					\
 	kicad-symbols							\
 	kicad-templates							\
 	kicad-packages3d						\
+	libpam-yubico							\
 	lynx								\
 	meshlab								\
 	minicom								\
@@ -299,6 +300,7 @@ DEBIAN_FRONTEND=noninteractive apt-get -y 				\
 	kicad-symbols							\
 	kicad-templates							\
 	kicad-packages3d						\
+	libpam-yubico							\
 	lynx								\
 	meshlab								\
 	minicom								\
@@ -334,4 +336,18 @@ DEBIAN_FRONTEND=noninteractive apt-get -y 				\
 
 cd /etc ; git add . ; git commit -a -m 'Install moar packages'
 
+apt remove light-locker --autoremove --purge -y
+
+cd /etc ; git add . ; git commit -a -m 'Remove light-locker'
+
+# Startup XXX disable unneeded.
+for i in avahi-daemon bluetooth lightdm postfix tor unattended-upgrades
+do echo $i 
+  /usr/sbin/update-rc.d $i disable
+done
+
+cd /etc ; git add . ; git commit -a -m 'Disable startup packages'
+
+apt clean
+
 exit 0