diff --git a/dot_config/waybar/executable_config.jsonc.tmpl b/dot_config/waybar/executable_config.jsonc.tmpl
index d93dbf5..6341534 100644
--- a/dot_config/waybar/executable_config.jsonc.tmpl
+++ b/dot_config/waybar/executable_config.jsonc.tmpl
@@ -6,7 +6,11 @@
     "spacing": 2,
     "modules-left": ["hyprland/workspaces"],
     "modules-center": ["hyprland/window"],
+    {{- if eq .chezmoi.hostname "wkz-pc" }}
+    "modules-right": [ "network", "wireplumber", "cpu", "memory", "temperature", "clock" ],
+    {{- else if eq .chezmoi.hostname "wkz-lapdog" }}
     "modules-right": [ "network", "wireplumber", "cpu", "memory", "temperature", "battery", "clock" ],
+    {{- end }}
 
     "hyprland/workspaces": {
         "workspace-taskbar": {
@@ -41,18 +45,27 @@
         "reverse-scrolling": 1
     },
     "cpu": {
+        {{- if eq .chezmoi.hostname "wkz-pc" }}
+        "interval": 3,
+        {{- else if eq .chezmoi.hostname "wkz-lapdog" }}
         "interval": 5,
+        {{- end }}
         "format": "{usage}% "
     },
     "memory": {
+        {{- if eq .chezmoi.hostname "wkz-pc" }}
+        "interval": 3,
+        {{- else if eq .chezmoi.hostname "wkz-lapdog" }}
         "interval": 5,
+        {{- end }}
         "format": "{}% "
     },
     "temperature": {
-        "interval": 5,
         {{- if eq .chezmoi.hostname "wkz-pc" }}
+        "interval": 3,
         "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input",
         {{- else if eq .chezmoi.hostname "wkz-lapdog" }}
+        "interval": 5,
         "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
         {{- end }}
         "critical-threshold": 70,
@@ -60,6 +73,7 @@
         "format-critical": "{temperatureC}°C {icon}",
         "format-icons": ["", "", "", "", ""],
     },
+    {{- if eq .chezmoi.hostname "wkz-lapdog" }}
     "battery": {
         "interval": 10,
         "states": {
@@ -74,6 +88,7 @@
         },
         "tooltip-format": "{time}"
     },
+    {{- end }}
     "clock": {
         "interval": 1,
         "format": "{:%H:%M:%S}",