diff --git a/hosts/workstation/hardware-configuration.nix b/hosts/workstation/hardware-configuration.nix
index d269491..94390b9 100644
--- a/hosts/workstation/hardware-configuration.nix
+++ b/hosts/workstation/hardware-configuration.nix
@@ -76,9 +76,9 @@
     "/mnt/games" = btrfsMount "games" // { };
     "/mnt/miniserver/pool" = nfsMount "miniserver" "pool" // { };
     "/mnt/miniserver/jawz" = nfsMount "miniserver" "jawz" // { };
-    "/mnt/server/pool" = nfsMount "server" "pool" // { };
-    "/mnt/server/jawz" = nfsMount "server" "jawz" // { };
-    "/mnt/server/btrfs" = nfsMount "server" "btrfs" // { };
+    # "/mnt/server/pool" = nfsMount "server" "pool" // { };
+    # "/mnt/server/jawz" = nfsMount "server" "jawz" // { };
+    # "/mnt/server/btrfs" = nfsMount "server" "btrfs" // { };
     "/boot" = {
       device = "/dev/disk/by-uuid/ac6d349a-96b9-499e-9009-229efd7743a5";
       fsType = "ext4";
diff --git a/secrets/keys.yaml b/secrets/keys.yaml
index 1725e50..cab0018 100644
--- a/secrets/keys.yaml
+++ b/secrets/keys.yaml
@@ -1,13 +1,15 @@
 public_keys:
     age: ENC[AES256_GCM,data:zHxSM0lMbOFgxR0zV/byXg1qfZ2fz+coAEnUg64HCYTir6Fbf4lKKLJPuN7md42IsCgzBkE2aR6EXfDxRNZk59kYqZw4GZtOQV9FWmeB5JsUwGP1TapRebmR/zcjgbwQ,iv:ispmW1I50n8WKn/34V+gdicEb7396SK7OcTLQWKq4+4=,tag:8PivakR8Mo/w2j0rLt/dUA==,type:str]
-    workstation: ENC[AES256_GCM,data:DF8YbH6JYnvVhFHHZO6IFBobI2EOCaIR34A9y2foqv0eRrzrid9chfZ4h10vlmZVuRuLB5gD9zCucKtpp+N5pYq4nVO9YEHt4ihlM88b5vn3efh440+U65lnN9nCNgPXbQ==,iv:a2WCJ73nOosWL509Byym6mI8zgOx7FTKn2MJVt/njA0=,tag:DCLlVE3l0jQjG5hZWYvL2Q==,type:str]
+    workstation: ENC[AES256_GCM,data:g1qejAegE2WLQ8pW868ZOuCzxIeKAPnSTl1tfMS5WEZCI1iwFA8L5N/nEwPWpzr1AhnKAP2CxnguBes7AgR9qzaFf56fVByfA4Zc5LqYBiSyCpZ7mF/nGrcQzMiqttJq5g==,iv:58/tWUjNdLzOHrliAlyhtZSNEakA1sphYrrqcWRTIMY=,tag:1fY94k11cvNploDtbglQ/w==,type:str]
+    workstation_old: ENC[AES256_GCM,data:GjYqRm8Aiox92P6SCpNu4I7t0IN5xdWwuyq04FJaIv3iU6BCIGM808QlsWgAthaZJuvaNaDeWdOjCLKFlgzbs5Me+fypcsPnMWjbA+NEr01tGqyG8yw/46WtnE1TWQgeYA==,iv:nPoACxQ7F39YCzV6BsCyOsVGMsz18MHIE57FEocduFk=,tag:5RK/aUqzWTTthcq6C7/7PA==,type:str]
     server: ENC[AES256_GCM,data:ZYYcjXp7BbniEL0uhR1YHWCCNOmf4VFpMHcJsXNdBARB3FCr7HIQmfUIaWtu8IDAwKUwPEcyeW8fdXSk/fTpBQnVV/Mlg6s3H7fXNYqlXa2AG5TpCWI89M6xsho=,iv:1RIWiWIU58W01weQw/aMfFAL9Gu8wvm2Znib4+amgfM=,tag:NN6saDGDDDRxg9HgKI3X0Q==,type:str]
     miniserver: ENC[AES256_GCM,data:0aI1r2O3u5gBl1icg+pkf1hsReZgvG3aPZhljaYUJWlNtYeairmN6Vd7nUOMu8u4NoRQdLvZC/369p/4GR9WvNUyuELiWbep1TdkxP0hu/wlrFCFJSYwJsm8x0izXmwA,iv:/qmAMMy5obLbw/VZG8zyV4svCWptYfbKi3+Sc1t8O6Q=,tag:R6ylK8O3jqhMPZaBTsrgtg==,type:str]
     galaxy: ENC[AES256_GCM,data:9xjiz/tVn0UlZ9qb/Oi951WWVjmk6HTDjjYzB8kULKYhPJgVdlQioGdJtn3MjKCfqH0UnBZHXoGaK0MsShtfB0xfZkW92dy35KiQ9kQTBJn9LMMNxuk6IEqpWKQ=,iv:6lPWZ1iqerbWfU0UavvpFNtnsxOLkKHGsm3A/X5xUs0=,tag:8hVDlOIcCN590jEFuJ6eSw==,type:str]
     deacero: ENC[AES256_GCM,data:S0FKo5q+grXFBoe9c6ADDA2uGZ1/OMzGU2p3i2PPdhO34PT39ePa/O6yP9Z69RvpL2Ho9GfLlBOSxZa1KtrJecEUoJZBdHWZRhKtcc0EM+CsNHnX74T9a/+uz3IIeys36FPBv5nTs9a22QL/5Q==,iv:xfkLrkje8pv0sMSnTrPrM5fmkAiliiYbGplz1KYYmec=,tag:3D4bZpYUQ/Oq25vfSklZBw==,type:str]
 private_keys:
     age: ENC[AES256_GCM,data:YZtCasGFuxj4mVnhDtNzXgrzvdjwvHVtaBj2gDJf3dzA7dCe+n7MC5mYowHnS+oZpGFt9P0ImKw30yAYRGZgvxJqL32ACbob4oqcnwmJgswx2ZCwboz/I1PKkAb5uo1Bhc3tyhEshiA9wk99CoI7ug+TGOC5eyFw8RM145uJdxaYJjFmYdSorbjYd5JpijYi3u7p5buIVtr8VRt3tuWNUzarW18d+ZjxtCAF68W9jqICtuODdFakt3pZ9/2byKR5KG1sBKdc38DvJFkRq3wlDE0U2PwPyc/RDdlLAnYGYlZD/GsC1YSWEW/ygxO5lpkoJlxF+/02Qs+lyZVEJd7buYCMU3xkR3kGOQB2dZXa7T6F+Jrr6Ek7svTOQRaId68KhQW33piNUXN8d6YnqIRj537exrcmVCNrRwJmlJ1M8pcYN4IGj6OFICw/lwiTcN51OL4UZOOQZZ60jbgdwWj5gM9OFmxLm0PkIRt6KMQVx58jIzmXqh8SF0+mkymbQdVaoDD5JJ+ltTQgIEBaPe7sGVEK4lGH6qbgtm4F,iv:coRTCK6BSI8QFtfjTg8IAdwumSt6fuQryTxF5g+GF9k=,tag:K06p6t3Gso30DTY/Nk5EDA==,type:str]
-    workstation: ENC[AES256_GCM,data:P8zF1rvCG8L8DQRtYJojd/AvjIlObrznl900x297ueI0rQtDMB36stEUR1+AclrFawGKsQVii3ldUm0JMemklEnOQwdjJgLrc5jDEDbSelEfz3++gYMqwJTlsGcMD34NLvNkaGEo8ZDGLWWhLNLDcoeWECyF2xywTXRuubLk9icuZ8/nuAYZqLCFCblUVtDsE5X7fcikeGi4nGryKcnq68AD3HxwwR/PK/zTHnocPE7DG7rc61mRFSRYdaE59eGaTcbr5liT6RYQ3yNPKW0Rzpl49XBwFN1pnAxbzia4Ueax4khxMszJKhuQjXK41mLRS0i5McEXN/ic4NjrRnFUw3KZ1dRKeqA6tDofFUo4lsmpQ0zlZlbxJzme2swig0x+DkBANz912rndtKdO0E3mAhljKGGYfyL0GTkMpRbWcCt72pPSdZZFV0KabFHKRO7U6I1MXtCokWbnjDflB7QgPBLjSIBR2MlcjCMz+M45n8qubDGUIDuMVIsw+3TlttDDGF0Q/EJTs1ewC8mmSzlUUQyU+pE5N1G6fSxVpCALoJu4570wGrBa1WVx+gV9gkhvZznRgssNX52nv/UwIk/i5HV2HU+qJv7ErbesV7kxLKI=,iv:Eh8W5GrQPbp2nPLjd4vGBgaJ3uwNeUHFIq6XwOHNt3Y=,tag:oox02coeHFDU7N1aO0Yilw==,type:str]
+    workstation: ENC[AES256_GCM,data:QrM6MwsStFeOH9bFaAuNPtxVWB7rlXXV0PD2Em5Nswf7PIPuzYagQaqBF5nV/AteeJjwsz6KLuBceMZ3O/WlccxvyfY6i00DuRvzJBi+5gZl2rfM4OR5sHC93bzcGmyU1dQUA0nEeGFYUfd4+ZM4BFRgD5OyhpjrqaNYw5kES6WZMCYiR8NAPE2Ca8MqCX3KVQp1AAzgFq/nN0cvuWIflYVIngR4PzAqDGXjgWaPT58rmcWk/3KS2nOKRX5tQ/CgJl4FLdrjuR4VLvoupeUqv1yNeSPSljX+gEK8Sn9vONFd5k0bifLzQd+zCLWyEdJgNvSPf7bnXcuqU8RLSmjckMRAP8YVBlyqsNY++JidXuXukV23aB63dUp44yhIYEkt49/ISJb2qerj3U/Sy97VTw/1WNwY1evzHPlobrUjt3ilxWoxAdzjrqJXWultYYBEk0crmKRRvnABMzaHrZaqaSrHsSfvE4E27m+L9HNwMyq7KywlwrB0KAog52iCi17Gbnrva9aEGrn8Mne2VCvwcrKSEciV1soKpQgy,iv:2+xsS/4+vfQ0UBsHgLVCeV6GOU8giclqNpPXoi43shE=,tag:YVSiY79mHJ2LE9Ab05VE1g==,type:str]
+    workstation_old: ENC[AES256_GCM,data:q4OlQXekL7EpuqL2LzPncRInyn3atWZHdeNC2fsrHQ7uUhVDxtjboZIk5G0yC/Raa+B2p6WAcrMfE8SkkL2G9vFjpxHWYX9AzuDKxpclqZIByJvmj2kT1i2+rOKmIvY0ygvN8qqwTG8wcZoIGt2gMePu84xo7a7XDmVB+QZf/wtVtd1OqON0jiJkBhbcrB1VHBn9jl5cLfqrJzNa8QM4i5oY4dXd1uCMXFjpw/6PwoVvrkHfxZiKaL7QMfLk1g2Gmi/50Nd7gl4LTKmSaKcb88G/YCuwY4eZUVSYutZHfMq0pZSW4Qe2N9d8WacNoHFcPhbTNmhUGps0S9RNEQYFfP6cIB5LJPh3CJXGzmRf5TGTd09i+2nwR874heGxfeZ7EzGwNm3TpPuZd8TRD9u6dn1cUAmkQ+5GoqLNk11sSGyeexuS3j4SEOKR8A3o8hIne1Ptw9/of//NEqEa//5lv7HRTkRui3+SRrPNFaebIcqVb7Q5O13QA+KZffO12QPaPxSr7UkrcHAjYLOeEtfOLVNwtHC44yTgbyia0UQCWIByWe7iUBHm19DByYa9EKHv18Q6cKiwpzjlh25HS9GErrl3kslL1IePU/D5zjJuzKg=,iv:aBmgpJjv//TzvXOyzTDFRl85vNty6+hLCur8O7/eLOQ=,tag:90k5n6eg9WGvAfJiauZnxg==,type:str]
     server: ENC[AES256_GCM,data:GRHzxJBEVG995fPWDdpqSV8b80kqVZcKBUg18sObNn2Rxwm/tajQunemQN8/0qXS37YACzMKX2zCyQGbIEq3d1id1CwRsao64vBFW5pZhlBiXXikP2O1NxQGCVc3ZzaPzYjeCP2uYT/I/b1ZPfUGONtcNGNgSlZQlqgBYmsH3Qp8kYRHiRxslfvyknqYDRCbRUVmtNffRqRMTHMHJFQAGLyqggy27pq2L7MSquTA8ravwj4jMp6R31f+IVufuYD/D82sAbSWy8J39QUGCt0qLvchuryDZzMkfqk+EktIQS9Invhuzael0N4RJykiwFRziwDbs1xYPY8dMfXYw37nrLow1R7lbuus4kkOcBmMqiyk5FWH1JkShRacviAQ6kB2hV7+HHhjH8y2OMYreEDIl5xk4lU/b7yO+/Jnc2Apbx383vS11iJ4Do/i2LF/9x0ILAh02pviaXi/aRnXqDqQKnHgNdCYIq/e4IWI96NkGgi1kPGr3vGl7ijoLfW+emqU97MG8j1tTIzMckdcDRpFLIoELJlbqn2L7Z1IdCXBygVMZVOxF9F+12iwyks02rg2LktmVlnknOeigEua,iv:bsv3nRX6xl08B1wGjEU0T26DvRVimfn9Edxl5eyxFK8=,tag:dQg7HQ+2T4UuvzxInQQEvQ==,type:str]
     miniserver: ENC[AES256_GCM,data:OdKoGmxZYBp/XTQIviGXcRrz8sY/Ea1KwqtwmYnDmejGZFQuotyr9IHDBy7nyC38Rq18jtRGK0DvQTs+0z/jaBrtAbnk3/aodRpy0q/82XOpUDJ+oRPIbuC1KEyN+vzzTe3jd5Auwg7dy/W7gKgAoR7vhkNeAY4TPbE2ybqsbPDIhDWmCMK43DIxKcWO8LrtYJ9/h+XR1XthGjICRXygOeMA80Ip4BWGMvXnfGcayKTIlotIWNasYGZNn5E/bfb6uH58zPvCAWavleRm113zOeMjlgbtAyl4IyM1StGvZtJq0ud9Txza4AkWmTvYLcAB0xaiph/Vm01GBlaGSWZmOqo8ybGEEQgh6JBlYzHwJ0swqg3uCW59jxeQcGOnaW0YrYPix8twd/2GQafxx2denWFgvoNk5itIdOr07BF+JYKd5FU/Kajo9P5mpV2uFR8sok8/Q68thYvfOEK4wOysWM46lHS/H/P1qeJvCbO6w0hGt+VN/1lbqm+pcVTDMVsfWOkA1Rmm0aWozoYOAPRXH/PjG1NTiqJnecsyw+vZLlnvaDNHKHWhxnWVJw51hSH2fTg7nVz+WqwC24eOmGpOG7UUCdQ4V8L3wb8qDPTmLmo=,iv:FxxpTqtde+v9c/+xDfWimYlgkhJSI5GFIOAwoSrjNsg=,tag:LcLxjKaQ/5JT3hJnBgzmqQ==,type:str]
 git_public_keys:
@@ -60,8 +62,8 @@ sops:
             dklwODNxYVo4a2FaWDJFM0FnV1l3SlUKMnq/MAJRwR7iEri2KomPrMj0gTkMyhzH
             P5E4zheU7chJTAz5jf6iecyOvKAt6q5g9Q1MU0D6dkOcv2gzWSNAAw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-22T19:53:46Z"
-    mac: ENC[AES256_GCM,data:P9LQUSY4alFLfJrrUpfqFSmvTjMH2r0R6Fb8CkhTiyQs9ERHFwtwvJfvv3N0D7sIBKa1HJ5Ps8dG9fOLzNMVuUtrQ6aYkRN9qD9Y9y21lGcPSDrU4uMa0DO+LmfRIxlFsBvIUNfp4Sg9zmcWH3nlpSumuoQNpJ20MYz//aUqYi4=,iv:p4fJe2B6c1ELbySIffS4ALKKTzFRXEgvSVTa+/TNnT8=,tag:Cxs/npMx7X2icLUl1CW2Ug==,type:str]
+    lastmodified: "2024-06-24T01:22:03Z"
+    mac: ENC[AES256_GCM,data:pmh/dm40zPIPY3LSGOykzwN+oZal9cfuE8JoOU05OoBAwPy6pXGRTKtYK1W4U9SS5dKdEqn1IkheJzljUyA6GWc0YoopZQvRvKiEzf+vdQG1T2DGp5whAW4tFMT+e4UYcjORnRN1FDMS5uDfT3OyO86Jy0JeG1m9Lix9Y0u/YuM=,iv:wv+3dpUUkuqkV+dOdXypK6B1WC/xK3HemsajwgKjuWw=,tag:uzDYF/Q8dqZypzmDwPVt1g==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/secrets/ssh/ed25519_workstation.pub b/secrets/ssh/ed25519_workstation.pub
index e30ce3f..7369bd6 100644
--- a/secrets/ssh/ed25519_workstation.pub
+++ b/secrets/ssh/ed25519_workstation.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH2wtsaMvfEUm//2YnFHyrc16o+TOXXBfIGPJ9nL8RMp jawz@workstation
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICcWnaIRWgH04Rc23afXMcEZnJ7JdmgeO4MfCoKio/gA jawz@workstation