diff --git a/dotfiles/systems/fighter/network-shares.nix b/dotfiles/systems/fighter/network-shares.nix
index 80124ebd..b4197261 100644
--- a/dotfiles/systems/fighter/network-shares.nix
+++ b/dotfiles/systems/fighter/network-shares.nix
@@ -1,11 +1,8 @@
 { pkgs, sys, ... }: let
-  iqn = "iqn.2020-03.net.jafner:fighter";
-  portals = { 
-    barbarian = {
-      ip = "192.168.1.10";
-      port = "3260";
-    };
-    paladin = {
+  
+  iscsi = { 
+    iqn = "iqn.2020-03.net.jafner:fighter";
+    portal = { # For Paladin
       ip = "192.168.1.12";
       port = "3260";
     };
@@ -13,31 +10,19 @@
 in {
   services.openiscsi = {
     enable = true;
-    name = iqn;
-    discoverPortal = "${portals.paladin.ip}:${portals.paladin.port}";
+    name = iscsi.iqn;
+    discoverPortal = "${iscsi.portal.ip}:${iscsi.portal.port}";
   };
 
   systemd.services = {
     iscsi-autoconnect-paladin = {
-      description = "Log into iSCSI target ${iqn} on paladin";
+      description = "Log into iSCSI target ${iscsi.iqn} on paladin";
       after = [ "network.target" "iscsid.service" ];
       wants = [ "iscsid.service" ];
       serviceConfig = {
-        ExecStartPre = "${pkgs.openiscsi}/bin/iscsiadm -m discovery -t sendtargets -p ${portals.paladin.ip}:${portals.paladin.port}";
-        ExecStart = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iqn} -p ${portals.paladin.ip}:${portals.paladin.port} --login";
-        ExecStop = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iqn} -p ${portals.paladin.ip}:${portals.paladin.port} --logout";
-        Restart = "on-failure";
-        RemainAfterExit = true;
-      };
-    };
-    iscsi-autoconnect-barbarian = {
-      description = "Log into iSCSI target ${iqn} on barbarian";
-      after = [ "network.target" "iscsid.service" ];
-      wants = [ "iscsid.service" ];
-      serviceConfig = {
-        ExecStartPre = "${pkgs.openiscsi}/bin/iscsiadm -m discovery -t sendtargets -p ${portals.barbarian.ip}:${portals.barbarian.port}";
-        ExecStart = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iqn} -p ${portals.barbarian.ip}:${portals.barbarian.port} --login";
-        ExecStop = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iqn} -p ${portals.barbarian.ip}:${portals.barbarian.port} --logout";
+        ExecStartPre = "${pkgs.openiscsi}/bin/iscsiadm -m discovery -t sendtargets -p ${iscsi.portal.ip}:${iscsi.portal.port}";
+        ExecStart = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iscsi.iqn} -p ${iscsi.portal.ip}:${iscsi.portal.port} --login";
+        ExecStop = "${pkgs.openiscsi}/bin/iscsiadm -m node -T ${iscsi.iqn} -p ${iscsi.portal.ip}:${iscsi.portal.port} --logout";
         Restart = "on-failure";
         RemainAfterExit = true;
       };
@@ -88,5 +73,15 @@ in {
       device = "//192.168.1.12/Torrenting";
       inherit fsType options;
     };
+    "/mnt/iscsi/fighter" = {
+     device = "/dev/disk/by-uuid/cf3a253c-e792-48b5-89a1-f91deb02b3be";
+     fsType = "ext4";
+     options = [
+      "nofail"
+      "auto"
+      "users"
+      "x-systemd.automount"
+     ];
+    };
   };
 }