diff --git a/bazarr/rootfs/etc/cont-init.d/20-folders.sh b/bazarr/rootfs/etc/cont-init.d/20-folders.sh
index dc382a687..05c7c8e6b 100755
--- a/bazarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/bazarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -24,6 +24,10 @@ slug=bazarr
 
 if [ -d "/homeassistant/addons_config/$slug" ]; then
     echo "Migrating /homeassistant/addons_config/$slug to /addon_configs/xxx-$slug"
-    cp -rnf /homeassistant/addons_config/"$slug"/* /config/ || true
+    tar -C /homeassistant/addons_config/"$slug" --exclude=addons_config -cf - . | tar -C /config -xf - || true
     mv /homeassistant/addons_config/"$slug" /homeassistant/addons_config/"$slug"_migrated
 fi
+
+if [ -d /config/addons_config ]; then
+    rm -rf /config/addons_config
+fi
diff --git a/lidarr/rootfs/etc/cont-init.d/20-folders.sh b/lidarr/rootfs/etc/cont-init.d/20-folders.sh
index b79564082..30e6a4e38 100755
--- a/lidarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/lidarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -18,6 +18,10 @@ slug=lidarr
 
 if [ -d "/homeassistant/addons_config/$slug" ]; then
     echo "Migrating /homeassistant/addons_config/$slug to /addon_configs/xxx-$slug"
-    cp -rnf /homeassistant/addons_config/"$slug"/* /config/ || true
+    tar -C /homeassistant/addons_config/"$slug" --exclude=addons_config -cf - . | tar -C /config -xf - || true
     mv /homeassistant/addons_config/"$slug" /homeassistant/addons_config/"$slug"_migrated
 fi
+
+if [ -d /config/addons_config ]; then
+    rm -rf /config/addons_config
+fi
diff --git a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
index 95a92bc8e..a514c680d 100755
--- a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -6,6 +6,10 @@ slug=prowlarr
 
 if [ -d "/homeassistant/addons_config/$slug" ]; then
     echo "Migrating /homeassistant/addons_config/$slug to /addon_configs/xxx-$slug"
-    cp -rnf /homeassistant/addons_config/"$slug"/* /config/ || true
+    tar -C /homeassistant/addons_config/"$slug" --exclude=addons_config -cf - . | tar -C /config -xf - || true
     mv /homeassistant/addons_config/"$slug" /homeassistant/addons_config/"$slug"_migrated
 fi
+
+if [ -d /config/addons_config ]; then
+    rm -rf /config/addons_config
+fi
diff --git a/radarr/rootfs/etc/cont-init.d/20-folders.sh b/radarr/rootfs/etc/cont-init.d/20-folders.sh
index 7aa75b9e7..65e74638d 100755
--- a/radarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/radarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -18,6 +18,10 @@ slug=radarr
 
 if [ -d "/homeassistant/addons_config/$slug" ]; then
     echo "Migrating /homeassistant/addons_config/$slug to /addon_configs/xxx-$slug"
-    cp -rnf /homeassistant/addons_config/"$slug"/* /config/ || true
+    tar -C /homeassistant/addons_config/"$slug" --exclude=addons_config -cf - . | tar -C /config -xf - || true
     mv /homeassistant/addons_config/"$slug" /homeassistant/addons_config/"$slug"_migrated
 fi
+
+if [ -d /config/addons_config ]; then
+    rm -rf /config/addons_config
+fi
diff --git a/readarr/rootfs/etc/cont-init.d/20-folders.sh b/readarr/rootfs/etc/cont-init.d/20-folders.sh
index ff6562c06..771e5e9a0 100755
--- a/readarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/readarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -18,10 +18,14 @@ slug=readarr
 
 if [ -d "/homeassistant/addons_config/$slug" ]; then
     echo "Migrating /homeassistant/addons_config/$slug to /addon_configs/xxx-$slug"
-    cp -rnf /homeassistant/addons_config/"$slug"/* /config/ || true
+    tar -C /homeassistant/addons_config/"$slug" --exclude=addons_config -cf - . | tar -C /config -xf - || true
     mv /homeassistant/addons_config/"$slug" /homeassistant/addons_config/"$slug"_migrated
 fi
 
+if [ -d /config/addons_config ]; then
+    rm -rf /config/addons_config
+fi
+
 if [ -d /config/readarr ]; then
     mv /config/readarr/{.,}* /config/ || true
     rmdir /config/readarr || true
diff --git a/sonarr/rootfs/etc/cont-init.d/20-folders.sh b/sonarr/rootfs/etc/cont-init.d/20-folders.sh
index 6183d0969..2b0945434 100755
--- a/sonarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/sonarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -18,6 +18,10 @@ slug=sonarr
 
 if [ -d "/homeassistant/addons_config/$slug" ]; then
     echo "Migrating /homeassistant/addons_config/$slug to /addon_configs/xxx-$slug"
-    cp -rnf /homeassistant/addons_config/"$slug"/* /config/ || true
+    tar -C /homeassistant/addons_config/"$slug" --exclude=addons_config -cf - . | tar -C /config -xf - || true
     mv /homeassistant/addons_config/"$slug" /homeassistant/addons_config/"$slug"_migrated
 fi
+
+if [ -d /config/addons_config ]; then
+    rm -rf /config/addons_config
+fi