diff --git a/supervisor/docker/addon.py b/supervisor/docker/addon.py
index 79aa90fa4..46f318672 100644
--- a/supervisor/docker/addon.py
+++ b/supervisor/docker/addon.py
@@ -360,18 +360,18 @@ class DockerAddon(DockerInterface):
                     Mount(
                         type=MountType.BIND,
                         source=self.addon.path_extern_config.as_posix(),
-                        target="/config",
+                        target="/addon_config",
                         read_only=addon_mapping[MAP_ADDON_CONFIG],
                     )
                 )
 
-            # Map Home Assistant config in new way
+            # Map Home Assistant config using the new mapping to /config still
             if MAP_HOMEASSISTANT_CONFIG in addon_mapping:
                 mounts.append(
                     Mount(
                         type=MountType.BIND,
                         source=self.sys_config.path_extern_homeassistant.as_posix(),
-                        target="/homeassistant",
+                        target="/config",
                         read_only=addon_mapping[MAP_HOMEASSISTANT_CONFIG],
                     )
                 )
diff --git a/tests/docker/test_addon.py b/tests/docker/test_addon.py
index d2391114b..d5edac539 100644
--- a/tests/docker/test_addon.py
+++ b/tests/docker/test_addon.py
@@ -149,12 +149,12 @@ def test_addon_map_homeassistant_folder(
     config["map"].append("homeassistant_config")
     docker_addon = get_docker_addon(coresys, addonsdata_system, config)
 
-    # Home Assistant config folder mounted to /homeassistant, not /config
+    # Home Assistant config folder still mounted to /config
     assert (
         Mount(
             type="bind",
             source=coresys.config.path_extern_homeassistant.as_posix(),
-            target="/homeassistant",
+            target="/config",
             read_only=True,
         )
         in docker_addon.mounts
@@ -194,7 +194,7 @@ def test_addon_map_addon_config_folder(
         Mount(
             type="bind",
             source=docker_addon.addon.path_extern_config.as_posix(),
-            target="/config",
+            target="/addon_config",
             read_only=True,
         )
         in docker_addon.mounts