diff --git a/.bin/update-system b/.bin/update-system
index f3c7d84..5ae9d56 100755
--- a/.bin/update-system
+++ b/.bin/update-system
@@ -8,4 +8,5 @@ echo
 echo -e "${GREEN}Updating ${BLUE}$(hostname)${GREEN}...${NC}"
 echo
 
-sudo guix system -v 3 -c 4 -L ~/git/dotfiles/ reconfigure ~/git/dotfiles/fschl/systems/$(hostname).scm
+sudo guix system -v 3 -c 10 -L ~/git/dotfiles/ reconfigure ~/git/dotfiles/fschl/systems/$(hostname).scm
+# sudo guix system -v 3 -c 8 -L ~/git/dotfiles/ build ~/git/dotfiles/fschl/systems/$(hostname).scm
diff --git a/fschl/systems/base.scm b/fschl/systems/base.scm
index 58e79a5..9a97763 100644
--- a/fschl/systems/base.scm
+++ b/fschl/systems/base.scm
@@ -35,7 +35,7 @@
    ;; Partition mounted on /boot/efi.
   (bootloader (bootloader-configuration
                 (bootloader grub-bootloader)
-                (targets (list "/dev/vda"))
+                (targets (list "/dev/nvme0n1p1"))
                 (keyboard-layout keyboard-layout)))
 ;;   (bootloader (bootloader-configuration
 ;;                (bootloader grub-efi-bootloader)
@@ -52,7 +52,7 @@
                    (check? #f))
 
                   (file-system
-                   (device "/dev/vda3")
+                   (device "/dev/nvme0n1p3")
                    (mount-point "/")
                    (type "ext4"))
                   %base-file-systems))
diff --git a/fschl/systems/tower-guix.scm b/fschl/systems/tower-guix.scm
new file mode 100644
index 0000000..25f2f18
--- /dev/null
+++ b/fschl/systems/tower-guix.scm
@@ -0,0 +1,45 @@
+(define-module (fschl systems tower-guix)
+  #:use-module (fschl utils)
+  #:use-module (fschl systems base)
+  #:use-module (fschl systems common)
+;  #:use-module (fschl home-services pipewire)
+  #:use-module (fschl home-services xsettingsd)
+  #:use-module (gnu home)
+  #:use-module (gnu packages file-systems)
+  #:use-module (gnu services)
+  #:use-module (gnu system)
+  #:use-module (gnu system uuid)
+  #:use-module (gnu system file-systems)
+  #:use-module (gnu system mapped-devices)
+  #:use-module (nongnu packages linux))
+
+(define home
+  (home-environment
+   (services (cons*
+              (service home-xsettingsd-service-type
+                       (home-xsettingsd-configuration
+                        (dpi 180)))
+;              (service home-pipewire-service-type)
+              common-home-services))))
+
+(define system
+  (operating-system
+   (inherit base-operating-system)
+   (host-name "tower-guix")
+
+   ;; Add sof-firmware drivers for audio on ThinkPad x230
+ ;;  (firmware (list linux-firmware sof-firmware))
+
+;;           (source (uuid "ad42a856-8e7c-4844-a55a-23ba4bd03dcc"))
+;;           (target "system-root")
+;;           (type luks-device-mapping))))
+
+   (file-systems (cons*
+                  (file-system
+                   (device "/dev/nvme0n1p3")
+                   (mount-point "/")
+                   (type "ext4"))
+                  %base-file-systems))))
+
+;; Return home or system config based on environment variable
+(if (getenv "RUNNING_GUIX_HOME") home system)