diff --git a/config/ansible/tasks/servers/services/hoarder/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/hoarder/docker-compose.yml.j2
index a26d17a..ef79cc6 100644
--- a/config/ansible/tasks/servers/services/hoarder/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/hoarder/docker-compose.yml.j2
@@ -6,9 +6,11 @@ services:
       - {{ hoarder_data_dir }}/hoarder:/data
     ports:
       - 3500:3000
-    env_file:
-      - .env
     environment:
+      HOARDER_VERSION: release
+      NEXTAUTH_SECRET: "{{ lookup('onepassword', ref='op://j7nmhqlsjmp2r6umly5t75hzb4/Hoarder/NEXTAUTH_SECRET') }}"
+      MEILI_MASTER_KEY: "{{ lookup('onepassword', ref='op://j7nmhqlsjmp2r6umly5t75hzb4/Hoarder/MEILI_MASTER_KEY') }}"
+      NEXTAUTH_URL: http://localhost:3000
       MEILI_ADDR: http://meilisearch:7700
       BROWSER_WEB_URL: http://chrome:9222
       OPENAI_API_KEY: "{{ lookup('onepassword', ref='op://j7nmhqlsjmp2r6umly5t75hzb4/Hoarder/OPENAI_API_KEY') }}"
diff --git a/config/home-manager/packages/common/packages.nix b/config/home-manager/packages/common/packages.nix
index a96e796..bb425ce 100644
--- a/config/home-manager/packages/common/packages.nix
+++ b/config/home-manager/packages/common/packages.nix
@@ -28,9 +28,6 @@
       wget
       fastfetch
 
-      # 1Password CLI
-      _1password-cli
-
       # Package management      
       devbox
 
diff --git a/config/home-manager/packages/server/packages.nix b/config/home-manager/packages/server/packages.nix
index f293108..2ca51d5 100644
--- a/config/home-manager/packages/server/packages.nix
+++ b/config/home-manager/packages/server/packages.nix
@@ -1,4 +1,9 @@
 { pkgs, ... }:
 {
-  home.packages = with pkgs; [ ddrescue ];
+  home.packages = with pkgs; [
+    ddrescue
+    
+    # 1Password CLI
+    _1password-cli
+  ];
 }