diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
index 780b28a1fabdb..c375fb0376458 100644
--- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
@@ -612,7 +612,7 @@ public function createUpdateFile($basename = null): bool
         $data .= '];';
 
         // Remove the old file, if it's there...
-        $configpath = JPATH_COMPONENT_ADMINISTRATOR . '/update.php';
+        $configpath = JPATH_ADMINISTRATOR . '/components/com_joomlaupdate/update.php';
 
         if (is_file($configpath)) {
             try {
@@ -900,8 +900,8 @@ public function cleanUp()
             }
 
             // Remove the update.php file used in Joomla 4.0.3 and later.
-            if (is_file(JPATH_COMPONENT_ADMINISTRATOR . '/update.php')) {
-                File::delete(JPATH_COMPONENT_ADMINISTRATOR . '/update.php');
+            if (is_file(JPATH_ADMINISTRATOR . '/components/com_joomlaupdate/update.php')) {
+                File::delete(JPATH_ADMINISTRATOR . '/components/com_joomlaupdate/update.php');
             }
 
             // Remove joomla.xml from the site's root.
diff --git a/administrator/components/com_media/src/View/Media/HtmlView.php b/administrator/components/com_media/src/View/Media/HtmlView.php
index 2d24f572af51b..dd26285661e1e 100644
--- a/administrator/components/com_media/src/View/Media/HtmlView.php
+++ b/administrator/components/com_media/src/View/Media/HtmlView.php
@@ -99,7 +99,7 @@ protected function prepareToolbar()
         // Add the upload and create folder buttons
         if ($user->authorise('core.create', 'com_media')) {
             // Add the upload button
-            $layout = new FileLayout('toolbar.upload', JPATH_COMPONENT_ADMINISTRATOR . '/layouts');
+            $layout = new FileLayout('toolbar.upload', JPATH_ADMINISTRATOR . '/components/com_media/layouts');
 
             $toolbar->customButton('upload')
                 ->html($layout->render([]));
@@ -116,7 +116,7 @@ protected function prepareToolbar()
         // Add a delete button
         if ($user->authorise('core.delete', 'com_media')) {
             // Instantiate a new FileLayout instance and render the layout
-            $layout = new FileLayout('toolbar.delete', JPATH_COMPONENT_ADMINISTRATOR . '/layouts');
+            $layout = new FileLayout('toolbar.delete', JPATH_ADMINISTRATOR . '/components/com_media/layouts');
 
             $toolbar->customButton('delete')
                 ->html($layout->render([]));
diff --git a/components/com_contact/src/Controller/DisplayController.php b/components/com_contact/src/Controller/DisplayController.php
index 4c606fdbe0884..50ddae3318575 100644
--- a/components/com_contact/src/Controller/DisplayController.php
+++ b/components/com_contact/src/Controller/DisplayController.php
@@ -42,7 +42,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null,
         $input = Factory::getApplication()->getInput();
 
         if ($input->get('view') === 'contacts' && $input->get('layout') === 'modal') {
-            $config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+            $config['base_path'] = JPATH_ADMINISTRATOR . '/components/com_contact';
         }
 
         parent::__construct($config, $factory, $app, $input);
diff --git a/components/com_content/src/Controller/DisplayController.php b/components/com_content/src/Controller/DisplayController.php
index 8f9bb4c3bd190..ebe4421cd602a 100644
--- a/components/com_content/src/Controller/DisplayController.php
+++ b/components/com_content/src/Controller/DisplayController.php
@@ -43,10 +43,10 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null,
 
         // Article frontpage Editor pagebreak proxying:
         if ($this->input->get('view') === 'article' && $this->input->get('layout') === 'pagebreak') {
-            $config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+            $config['base_path'] = JPATH_ADMINISTRATOR . '/components/com_content';
         } elseif ($this->input->get('view') === 'articles' && $this->input->get('layout') === 'modal') {
             // Article frontpage Editor article proxying:
-            $config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+            $config['base_path'] = JPATH_ADMINISTRATOR . '/components/com_content';
         }
 
         parent::__construct($config, $factory, $app, $input);
diff --git a/components/com_contenthistory/src/Controller/DisplayController.php b/components/com_contenthistory/src/Controller/DisplayController.php
index 7e03191127121..dc1e329c3d60f 100644
--- a/components/com_contenthistory/src/Controller/DisplayController.php
+++ b/components/com_contenthistory/src/Controller/DisplayController.php
@@ -36,7 +36,7 @@ class DisplayController extends BaseController
      */
     public function __construct($config = [], ?MVCFactoryInterface $factory = null, $app = null, $input = null)
     {
-        $config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+        $config['base_path'] = JPATH_ADMINISTRATOR . '/components/com_contenthistory';
 
         parent::__construct($config, $factory, $app, $input);
     }
diff --git a/components/com_contenthistory/src/Dispatcher/Dispatcher.php b/components/com_contenthistory/src/Dispatcher/Dispatcher.php
index 9534de6e17e16..c56afe13626c6 100644
--- a/components/com_contenthistory/src/Dispatcher/Dispatcher.php
+++ b/components/com_contenthistory/src/Dispatcher/Dispatcher.php
@@ -69,7 +69,7 @@ protected function checkAccess()
      */
     public function getController(string $name, string $client = '', array $config = []): BaseController
     {
-        $config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+        $config['base_path'] = JPATH_ADMINISTRATOR . '/components/com_contenthistory';
         $client              = 'Administrator';
 
         return parent::getController($name, $client, $config);
diff --git a/components/com_fields/src/Controller/DisplayController.php b/components/com_fields/src/Controller/DisplayController.php
index 74a55c4116d1b..bd1db65e71c21 100644
--- a/components/com_fields/src/Controller/DisplayController.php
+++ b/components/com_fields/src/Controller/DisplayController.php
@@ -41,7 +41,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null,
             // Load the backend language file.
             $app->getLanguage()->load('com_fields', JPATH_ADMINISTRATOR);
 
-            $config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+            $config['base_path'] = JPATH_ADMINISTRATOR . '/components/com_fields';
         }
 
         parent::__construct($config, $factory, $app, $input);
diff --git a/components/com_menus/src/Dispatcher/Dispatcher.php b/components/com_menus/src/Dispatcher/Dispatcher.php
index 65a57e1ae63bd..e669d119bb42c 100644
--- a/components/com_menus/src/Dispatcher/Dispatcher.php
+++ b/components/com_menus/src/Dispatcher/Dispatcher.php
@@ -70,7 +70,7 @@ public function checkAccess()
      */
     public function getController(string $name, string $client = '', array $config = []): BaseController
     {
-        $config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+        $config['base_path'] = JPATH_ADMINISTRATOR . '/components/com_menus';
         $client              = 'Administrator';
 
         return parent::getController($name, $client, $config);
diff --git a/components/com_modules/src/Controller/DisplayController.php b/components/com_modules/src/Controller/DisplayController.php
index dc76c599ac657..895b33effdad7 100644
--- a/components/com_modules/src/Controller/DisplayController.php
+++ b/components/com_modules/src/Controller/DisplayController.php
@@ -43,7 +43,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null,
 
         // Modules frontpage Editor Module proxying.
         if ($this->input->get('view') === 'modules' && $this->input->get('layout') === 'modal') {
-            $config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+            $config['base_path'] = JPATH_ADMINISTRATOR . '/components/com_modules';
         }
 
         parent::__construct($config, $factory, $app, $input);
diff --git a/components/com_modules/src/Dispatcher/Dispatcher.php b/components/com_modules/src/Dispatcher/Dispatcher.php
index 6672e696f67f2..98b8452b7a70b 100644
--- a/components/com_modules/src/Dispatcher/Dispatcher.php
+++ b/components/com_modules/src/Dispatcher/Dispatcher.php
@@ -71,7 +71,7 @@ public function checkAccess()
     public function getController(string $name, string $client = '', array $config = []): BaseController
     {
         if ($this->input->get('task') === 'orderPosition') {
-            $config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+            $config['base_path'] = JPATH_ADMINISTRATOR . '/components/com_modules';
             $client              = 'Administrator';
         }