diff --git a/_machines/tb-hak.yml b/_machines/tb-hak.yml
index 2a54b34..2c50696 100644
--- a/_machines/tb-hak.yml
+++ b/_machines/tb-hak.yml
@@ -5,3 +5,15 @@ git_gpg_sign: false
 gpg_agent: false
 ssh_agent: false
 terminal_binary: urxvt
+
+screen:
+  1: DP-1-1
+  2: DP-1-1
+  3: DP-1-2
+  4: DP-1-2
+  5: DP-1-2
+  6: DP-1-2
+  7: eDP-1
+  8: eDP-1
+  9: eDP-1
+  0: eDP-1
diff --git a/i3/config.j2 b/i3/config.j2
index 8707f13..2fafba0 100644
--- a/i3/config.j2
+++ b/i3/config.j2
@@ -98,16 +98,16 @@
 ### WORKSPACE ASSIGNMENTS ######################################################
 ################################################################################
 
-workspace $workspace1 output HDMI3
-workspace $workspace2 output HDMI3
-workspace $workspace3 output HDMI2
-workspace $workspace4 output HDMI2
-workspace $workspace5 output HDMI2
-workspace $workspace6 output HDMI2
-workspace $workspace7 output LVDS1
-workspace $workspace8 output LVDS1
-workspace $workspace9 output LVDS1
-workspace $workspace10 output LVDS1
+workspace $workspace1 output {{ machine.screen.1 }}
+workspace $workspace2 output {{ machine.screen.2 }}
+workspace $workspace3 output {{ machine.screen.3 }}
+workspace $workspace4 output {{ machine.screen.4 }}
+workspace $workspace5 output {{ machine.screen.5 }}
+workspace $workspace6 output {{ machine.screen.6 }}
+workspace $workspace7 output {{ machine.screen.7 }}
+workspace $workspace8 output {{ machine.screen.8 }}
+workspace $workspace9 output {{ machine.screen.9 }}
+workspace $workspace10 output {{ machine.screen.0 }}
 
 assign [class="^Keepassx$"] $workspace8