diff --git a/.github/actions/addon-linter/action.yml b/.github/actions/addon-linter/action.yml
deleted file mode 100644
index ee70d0fba0..0000000000
--- a/.github/actions/addon-linter/action.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Home Assistant add-on linter compatibility
-description: Normalize current app_config map names for the upstream add-on linter
-
-inputs:
-  path:
-    description: Path to the add-on directory
-    required: true
-  community:
-    description: Enable upstream community checks
-    required: false
-    default: "false"
-
-runs:
-  using: composite
-  steps:
-    - name: Prepare manifest for upstream linter
-      shell: bash
-      env:
-        SOURCE_PATH: ${{ inputs.path }}
-        DESTINATION_PATH: ${{ github.workspace }}/.addon-lint
-      run: |
-        set -euo pipefail
-        python3 "$GITHUB_ACTION_PATH/../../scripts/prepare_addon_lint_config.py" \
-          "$SOURCE_PATH" \
-          "$DESTINATION_PATH"
-
-    - name: Run upstream Home Assistant add-on linter
-      uses: frenck/action-addon-linter@v2
-      with:
-        path: ./.addon-lint
-        community: ${{ inputs.community }}
diff --git a/cleanuparr/CHANGELOG.md b/cleanuparr/CHANGELOG.md
index 6828b772c6..aeb01b8882 100644
--- a/cleanuparr/CHANGELOG.md
+++ b/cleanuparr/CHANGELOG.md
@@ -1,4 +1,5 @@
 - Migrate legacy add-on configuration map names to current app configuration terminology.
+- Fix persistent data directory: the entrypoint now writes to the `/config` mount (the container-side path of the `app_config` map) instead of an unmounted `/app_configs/cleanuparr` path, so Cleanuparr's data survives container recreation.
  
 ## 2.10.2 (2026-08-01)
 - Update to latest version from Cleanuparr/Cleanuparr (changelog : https://github.com/Cleanuparr/Cleanuparr/releases)
diff --git a/cleanuparr/rootfs/ha_entrypoint.sh b/cleanuparr/rootfs/ha_entrypoint.sh
index bd7630a837..34b3ab62ec 100755
--- a/cleanuparr/rootfs/ha_entrypoint.sh
+++ b/cleanuparr/rootfs/ha_entrypoint.sh
@@ -5,7 +5,7 @@ set -e
 ###############################################################################
 # Home Assistant Addon entrypoint for Cleanuparr
 # The .NET app uses /app/config as its data directory.
-# We symlink /app/config → /app_configs/cleanuparr (HA persistent storage)
+# We symlink /app/config → /config (the HA app_config mount, HA persistent storage)
 # and start ./Cleanuparr directly, bypassing the original /entrypoint.sh
 # which would trigger the /config Docker VOLUME mount.
 ###############################################################################
@@ -26,7 +26,7 @@ if [ -d /etc/cont-init.d ]; then
 fi
 
 # ─── Setup persistent data directory ─────────────────────────────────────────
-HA_DATA_DIR="/app_configs/cleanuparr"
+HA_DATA_DIR="/config"
 echo "[Cleanuparr] Setting up data directory: $HA_DATA_DIR"
 mkdir -p "$HA_DATA_DIR"
 
diff --git a/joplin/README.md b/joplin/README.md
index 8864639fb9..87ac12d478 100644
--- a/joplin/README.md
+++ b/joplin/README.md
@@ -106,7 +106,7 @@ To enable email functionality for user registration and notifications:
 
 ### Custom Scripts and Environment Variables
 
-This addon supports custom scripts and environment variables through the `app_config` mapping:
+This addon supports custom scripts and environment variables through the existing `config:rw` mapping:
 
 - **Custom scripts**: See [Running Custom Scripts in Addons](https://github.com/alexbelgium/hassio-addons/wiki/Running-custom-scripts-in-Addons)
 - **env_vars option**: Use the add-on `env_vars` option to pass extra environment variables (uppercase or lowercase names). See https://github.com/alexbelgium/hassio-addons/wiki/Add-Environment-variables-to-your-Addon-2 for details.
diff --git a/qbittorrent/rootfs/etc/cont-init.d/00-folders.sh b/qbittorrent/rootfs/etc/cont-init.d/00-folders.sh
index 76163f8d7b..06a4787891 100755
--- a/qbittorrent/rootfs/etc/cont-init.d/00-folders.sh
+++ b/qbittorrent/rootfs/etc/cont-init.d/00-folders.sh
@@ -19,8 +19,8 @@ if [ -f /homeassistant/addons_config/qBittorrent/qBittorrent.conf ] && [ ! -f /h
     cp -rnp /homeassistant/addons_config/qBittorrent/* /config/qBittorrent/ &> /dev/null || true
     if [ -d /config/qBittorrent/addons_config ]; then rm -r /config/qBittorrent/addons_config; fi
     if [ -d /config/qBittorrent/qBittorrent ]; then rm -r /config/qBittorrent/qBittorrent; fi
-    echo "Files moved to /app_configs/$HOSTNAME/openvpn" > /homeassistant/addons_config/qBittorrent/migrated
-    bashio::log.yellow "... moved files from /config/addons_config/qBittorrent to /app_configs/$HOSTNAME/qBitorrent (must be accessed with my Filebrowser addon)"
+    echo "Files moved to /app_configs/$HOSTNAME/qBittorrent" > /homeassistant/addons_config/qBittorrent/migrated
+    bashio::log.yellow "... moved files from /config/addons_config/qBittorrent to /app_configs/$HOSTNAME/qBittorrent (must be accessed with my Filebrowser addon)"
     MIGRATED=true
 fi