diff --git a/config/media.nix b/config/media.nix
index be9107c..e1eaa5b 100644
--- a/config/media.nix
+++ b/config/media.nix
@@ -39,7 +39,7 @@
       enable = true;
       openFirewall = true;
       user = "media";
-      dataDir = "/mnt/storage/plex";
+      dataDir = "/mnt/media/plex";
   };
 
   # Nextcloud Setup
@@ -52,7 +52,7 @@
       https = true;
 
       hostName = "nextcloud.randomctf.com";
-      datadir = "/mnt/storage/nextcloud";
+      datadir = "/mnt/files/nextcloud";
       maxUploadSize = "50G";
 
       settings = {
@@ -69,7 +69,7 @@
   # Gitea
   services.gitea = {
       enable = true;
-      stateDir = "/mnt/storage/gitea";
+      stateDir = "/mnt/files/gitea";
       settings = {
           server = {
               ROOT_URL = "https://git.randomctf.com";
diff --git a/hardware/media.nix b/hardware/media.nix
index 12c4983..0a38e00 100644
--- a/hardware/media.nix
+++ b/hardware/media.nix
@@ -18,11 +18,16 @@
       fsType = "ext4";
     };
 
-  fileSystems."/mnt/storage" =
+  fileSystems."/mnt/media" =
     { device = "/dev/disk/by-uuid/b579c911-e74c-4f03-b918-a4e5a6b764ab";
       fsType = "ext4";
     };
 
+  fileSystems."/mnt/files" =
+    { device = "/dev/disk/by-uuid/f3a62e58-9556-47d7-b78b-3211f269f4ce";
+      fsType = "ext4";
+    };
+
   fileSystems."/boot" =
     { device = "/dev/disk/by-uuid/3B58-9662";
       fsType = "vfat";