diff --git a/_machines/notebook01.yml b/_machines/notebook01.yml
index 011e4d9..2eed655 100644
--- a/_machines/notebook01.yml
+++ b/_machines/notebook01.yml
@@ -18,3 +18,8 @@ screen:
   0: eDP-1
 
 workspace:
+
+environment:
+  MACHINE_HAS_KEEPASSX: 0
+  MACHINE_HAS_NEXTCLOUD: 1
+  MACHINE_HAS_GDRIVE_BACKUP: 0
diff --git a/_machines/tb-hak.yml b/_machines/tb-hak.yml
index 9252164..6148da4 100644
--- a/_machines/tb-hak.yml
+++ b/_machines/tb-hak.yml
@@ -26,3 +26,8 @@ workspace:
   8: pass
   9: music
   10: pim
+
+environment:
+  MACHINE_HAS_KEEPASSX: 1
+  MACHINE_HAS_NEXTCLOUD: 0
+  MACHINE_HAS_GDRIVE_BACKUP: 0
diff --git a/autostart.sh b/autostart.sh
index 3f23d5c..be72ee0 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -107,10 +107,16 @@ run pasystray pasystray
 
 run redshift redshift-gtk -b 1 -l "$redshift_lat_long" -t "$redshift_colortemp"
 
-run keepassx keepassx --keyfile ~/.secret/main.key ~/.secret/main.kdbx
+if [[ "${MACHINE_HAS_KEEPASSX}" ]] ; then
+    run keepassx keepassx --keyfile ~/.secret/main.key ~/.secret/main.kdbx
+fi
 
 run spotify spotify
 
-run nextcloud nextcloud
+if [[ "${MACHINE_HAS_NEXTCLOUD}" ]] ; then
+    run nextcloud nextcloud
+fi
 
-[[ -x ~/bin/gdrive-backup ]] && schedule backup "Mon..Fri 12:00:00" ~/bin/gdrive-backup
+if [[ "${MACHINE_HAS_GDRIVE_BACKUP}" ]] ; then
+    [[ -x ~/bin/gdrive-backup ]] && schedule backup "Mon..Fri 12:00:00" ~/bin/gdrive-backup
+fi
diff --git a/zsh/zprofile.j2 b/zsh/zprofile.j2
index ff48e25..4017dbc 100644
--- a/zsh/zprofile.j2
+++ b/zsh/zprofile.j2
@@ -53,3 +53,7 @@ if [[ -z $DISPLAY ]] ; then
         tmux new-session -A -s tmux-tty-$XDG_VTNR
     fi
 fi
+
+{% for k, v in machine.environment.items() %}
+{{ k }}="{{ v }}"
+{% endfor %}