diff --git a/.config/environment b/.config/environment
index 518ddd2..7a3a2b5 100644
--- a/.config/environment
+++ b/.config/environment
@@ -48,6 +48,8 @@ export TIME_STYLE="long-iso"
 
 export VIMINIT="if has('nvim') | source $XDG_CONFIG_HOME/nvim/init.lua | else | source $XDG_CONFIG_HOME/vim/vimrc | endif"
 
+export YADM_OVERRIDE_ARCHIVE="$HOME/.password-store/yadm.gpg"
+
 
 for additional_env in "$XDG_CONFIG_HOME/env.d/"*; do
 	# check for ## in name to ignore yadm files
diff --git a/.config/yadm/hooks/pre_commit b/.config/yadm/hooks/pre_commit
index e7d8dbc..e357539 100755
--- a/.config/yadm/hooks/pre_commit
+++ b/.config/yadm/hooks/pre_commit
@@ -2,9 +2,11 @@
 
 # Check encrypted files for newer versions
 files="$HOME/.config/yadm/encrypt"
-archive="$HOME/.local/share/yadm/archive"
+archive="$HOME/.password-store/yadm.gpg"
 new_files=false
 
+[ -f "$archive" ] || exit 0
+
 echo "Checking for newer versions of encrypted files..."
 while IFS= read -r file
 do
diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive
deleted file mode 100644
index b545bad..0000000
Binary files a/.local/share/yadm/archive and /dev/null differ