diff --git a/_machines/notebook01.yml b/_machines/notebook01.yml
index 456226c..4c356a1 100644
--- a/_machines/notebook01.yml
+++ b/_machines/notebook01.yml
@@ -26,6 +26,6 @@ screen:
 workspace:
 
 environment:
-  MACHINE_HAS_KEEPASSX: 0
-  MACHINE_HAS_NEXTCLOUD: 1
-  MACHINE_RESTIC_BACKUP: 0
+  MACHINE_HAS_KEEPASSX: "false"
+  MACHINE_HAS_NEXTCLOUD: "true"
+  MACHINE_RESTIC_BACKUP: "false"
diff --git a/_machines/tb-hak.yml b/_machines/tb-hak.yml
index 92f98d1..01df39a 100644
--- a/_machines/tb-hak.yml
+++ b/_machines/tb-hak.yml
@@ -38,6 +38,6 @@ workspace:
   10: pim
 
 environment:
-  MACHINE_HAS_KEEPASSX: 1
-  MACHINE_HAS_NEXTCLOUD: 0
-  MACHINE_RESTIC_BACKUP: 1
+  MACHINE_HAS_KEEPASSX: "true"
+  MACHINE_HAS_NEXTCLOUD: "false"
+  MACHINE_RESTIC_BACKUP: "true"
diff --git a/autostart.sh b/autostart.sh
index 14b6224..3fc1e00 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -136,17 +136,17 @@ run pasystray pasystray
 
 run redshift redshift-gtk -b 1 -l "$redshift_lat_long" -t "$redshift_colortemp"
 
-if [[ "${MACHINE_HAS_KEEPASSX}" ]] ; then
+if [[ "${MACHINE_HAS_KEEPASSX}" == "true" ]] ; then
     run keepassx keepassx --keyfile ~/.secret/main.key ~/.secret/main.kdbx
 fi
 
 run spotify spotify
 
-if [[ "${MACHINE_HAS_NEXTCLOUD}" ]] ; then
+if [[ "${MACHINE_HAS_NEXTCLOUD}" == "true" ]] ; then
     run nextcloud nextcloud
 fi
 
-if [[ "${MACHINE_HAS_RESTIC_BACKUP}" ]] ; then
+if [[ "${MACHINE_HAS_RESTIC_BACKUP}" == "true" ]] ; then
     [[ -x ~/bin/restic-backup ]] && schedule restic-backup "Mon..Fri 12:00:00" ~/bin/restic-backup
 fi