diff --git a/hosts/docker/configuration.nix b/hosts/docker/configuration.nix
index 7291008..fff4f76 100644
--- a/hosts/docker/configuration.nix
+++ b/hosts/docker/configuration.nix
@@ -17,8 +17,6 @@ in
       ../../common/configuration.nix
       ../../modules/nix/cache-client.nix
       ../../modules/nix/remote-builder-client.nix
-#      ../../modules/nix/mount-docker-config.nix
-#      ../../modules/nix/mount-docker-volumes.nix
       ../../modules/nix/docker-data.nix
     ];
 
@@ -195,12 +193,19 @@ systemd.timers.nextcloud = {
     };
   };
 
+systemd.tmpfiles.rules = [
+  # Create /mnt/docker
+  #"d /mnt/docker 0755 root root -"
 
+  # Create /home/nixos/docker -> /mnt/docker-config
+  "L+ /home/nixos/docker - - - - /mnt/docker/config"
+
+];
 
 #Add sym links to data on users home folder
-system.userActivationScripts.createDockerSymlink.text = ''
-  ln -sf /mnt/docker-config /home/nixos/docker
-'';
+#system.userActivationScripts.createDockerSymlink.text = ''
+#  ln -sf /mnt/docker/config /home/nixos/docker
+#'';
 #system.userActivationScripts.createSetupSymlink.text = ''
 #  ln -sf /mnt/docker-persistent-data/setup /home/nixos/setup
 #'';
diff --git a/modules/nix/docker-data.nix b/modules/nix/docker-data.nix
index b874d29..2c6245c 100644
--- a/modules/nix/docker-data.nix
+++ b/modules/nix/docker-data.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  fileSystems."/mnt/docker-config" = {
+  fileSystems."/mnt/docker/config" = {
     device = "server:/tank/docker/config";
     fsType = "nfs";
 
@@ -13,7 +13,7 @@
     ];
   };
 
-  fileSystems."/mnt/docker-databases" = {
+  fileSystems."/mnt/docker/databases" = {
     device = "server:/tank/docker/databases";
     fsType = "nfs";
 
@@ -25,7 +25,7 @@
     ];
   };
 
-  fileSystems."/mnt/docker-volumes" = {
+  fileSystems."/mnt/docker/volumes" = {
     device = "server:/tank/docker/volumes";
     fsType = "nfs";
 
@@ -49,16 +49,4 @@
     ];
   };
 
- fileSystems."/mnt/docker/test" = {
-    device = "server:/tank/docker/nextcloud-data";
-    fsType = "nfs";
-
-    options = [
-      "nfsvers=4.2"
-      "_netdev"
-      "x-systemd.automount"
-      "noatime"
-    ];
-  };
-
 }
diff --git a/modules/nix/mount-docker-config.nix b/modules/nix/mount-docker-config.nix
deleted file mode 100644
index 43325e5..0000000
--- a/modules/nix/mount-docker-config.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  fileSystems."/mnt/docker-config" = {
-    device = "server:/tank/docker/config";
-    fsType = "nfs";
-
-    options = [
-      "nfsvers=4.2"
-      "_netdev"
-      "x-systemd.automount"
-      "noatime"
-    ];
-  };
-}
diff --git a/modules/nix/mount-docker-databases.nix b/modules/nix/mount-docker-databases.nix
deleted file mode 100644
index 40983af..0000000
--- a/modules/nix/mount-docker-databases.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  fileSystems."/mnt/docker-databases" = {
-    device = "server:/tank/docker/databases";
-    fsType = "nfs";
-
-    options = [
-      "nfsvers=4.2"
-      "_netdev"
-      "x-systemd.automount"
-      "noatime"
-    ];
-  };
-}
diff --git a/modules/nix/mount-docker-volumes.nix b/modules/nix/mount-docker-volumes.nix
deleted file mode 100644
index 430b623..0000000
--- a/modules/nix/mount-docker-volumes.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  fileSystems."/mnt/docker-volumes" = {
-    device = "server:/tank/docker/volumes";
-    fsType = "nfs";
-
-    options = [
-      "nfsvers=4.2"
-      "_netdev"
-      "x-systemd.automount"
-      "noatime"
-    ];
-  };
-}