diff --git a/dviml_common.sh b/dviml_common.sh
index 3e1f541..b68b25f 100755
--- a/dviml_common.sh
+++ b/dviml_common.sh
@@ -28,8 +28,7 @@ mkdir -p "${APP_PERSIST_DIR}/cache"
 mkdir -p "${APP_PERSIST_DIR}/kiro/kiro"
 mkdir -p "${APP_PERSIST_DIR}/kiro/kiro-cli"
 mkdir -p "${APP_PERSIST_DIR}/nvim-haven"
-mkdir -p "${APP_PERSIST_DIR}/shada"
-mkdir -p "${APP_PERSIST_DIR}/swap"
+mkdir -p "${APP_PERSIST_DIR}/nvim-state"
 mkdir -p "${APP_PERSIST_DIR}/undo"
 
 path_join() {
@@ -80,8 +79,7 @@ docker run --rm -it \
   -v "${APP_PERSIST_DIR}/kiro/kiro":/home/neovim/.kiro:z \
   -v "${APP_PERSIST_DIR}/kiro/kiro-cli":/home/neovim/.local/share/kiro-cli:z \
   -v "${APP_PERSIST_DIR}/nvim-haven":/home/neovim/.local/share/nvim/nvim-haven:z \
-  -v "${APP_PERSIST_DIR}/shada":/home/neovim/.local/state/nvim/shada:z \
-  -v "${APP_PERSIST_DIR}/swap":/home/neovim/.local/state/nvim/swap:z \
+  -v "${APP_PERSIST_DIR}/nvim-state":/home/neovim/.local/state/nvim:z \
   -v "${APP_PERSIST_DIR}/undo":/home/neovim/.local/share/nvim/.undo:z \
   -v /var/run/docker.sock:/var/run/docker.sock \
   -w "${WORKSPACE_DIR}" \