diff --git a/homelab/stacks/ai/stack.nix b/homelab/stacks/ai/stack.nix
index d47fe0cc..ef994bca 100644
--- a/homelab/stacks/ai/stack.nix
+++ b/homelab/stacks/ai/stack.nix
@@ -8,7 +8,7 @@
     };
     "${stack}/.env" = {
       enable = true;
-      text = ''APPDATA=${sys.dataDirs.appdata}'';
+      text = ''APPDATA=${sys.dataDirs.appdata}/${stack}'';
       target = "stacks/${stack}/.env";
     };
   };
diff --git a/homelab/stacks/wireguard/docker-compose.yml b/homelab/stacks/wireguard/docker-compose.yml
index 06b179f1..588be3fe 100644
--- a/homelab/stacks/wireguard/docker-compose.yml
+++ b/homelab/stacks/wireguard/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     networks:
       - web
     volumes:
-      - ${APPDATA}/wireguard:/etc/wireguard
+      - ${APPDATA}:/etc/wireguard
     cap_add:
       - NET_ADMIN
       - SYS_MODULE
diff --git a/homelab/stacks/wireguard/stack.nix b/homelab/stacks/wireguard/stack.nix
index d9bc7c7a..64c892fc 100644
--- a/homelab/stacks/wireguard/stack.nix
+++ b/homelab/stacks/wireguard/stack.nix
@@ -8,14 +8,8 @@
     };
     "${stack}/.env" = {
       enable = true;
-      text = ''APPDATA=${sys.dataDirs.appdata}'';
+      text = ''APPDATA=${sys.dataDirs.appdata}/${stack}'';
       target = "stacks/${stack}/.env";
     };
   };
-  sops.secrets."${stack}" = { 
-    sopsFile = ./secrets.env;
-    key = "";
-    mode = "0440";
-    owner = sys.username;
-  };
 }
\ No newline at end of file
diff --git a/homelab/stacks/zipline/docker-compose.yml b/homelab/stacks/zipline/docker-compose.yml
index b71d78d3..2ddade59 100644
--- a/homelab/stacks/zipline/docker-compose.yml
+++ b/homelab/stacks/zipline/docker-compose.yml
@@ -23,8 +23,8 @@ services:
       - path: /run/secrets/zipline/zipline
         required: true
     volumes:
-      - $APPDATA/zipline/uploads:/uploads
-      - $APPDATA/zipline/public:/public
+      - $APPDATA/uploads:/uploads
+      - $APPDATA/public:/public
     labels:
       - traefik.http.routers.zipline.rule=Host(`zipline.jafner.net`)
       - traefik.http.routers.zipline.tls.certresolver=lets-encrypt
diff --git a/homelab/stacks/zipline/stack.nix b/homelab/stacks/zipline/stack.nix
index 653bd351..d2cc23cf 100644
--- a/homelab/stacks/zipline/stack.nix
+++ b/homelab/stacks/zipline/stack.nix
@@ -8,7 +8,7 @@
     };
     "${stack}/.env" = {
       enable = true;
-      text = ''APPDATA=${sys.dataDirs.appdata}'';
+      text = ''APPDATA=${sys.dataDirs.appdata}/${stack}'';
       target = "stacks/${stack}/.env";
     };
   };