diff --git a/packages/core/content-manager/server/middlewares/routing.js b/packages/core/content-manager/server/middlewares/routing.js
index a14a90a510..9c03fdf4ab 100644
--- a/packages/core/content-manager/server/middlewares/routing.js
+++ b/packages/core/content-manager/server/middlewares/routing.js
@@ -23,7 +23,7 @@ module.exports = async (ctx, next) => {
 
   const configPath =
     ct.plugin === 'admin'
-      ? ['server.admin.layout', ct.modelName, 'actions', action]
+      ? ['admin.layout', ct.modelName, 'actions', action]
       : ['plugin', ct.plugin, 'layout', ct.modelName, 'actions', action];
 
   const actionConfig = strapi.config.get(configPath);
diff --git a/packages/core/strapi/lib/commands/develop.js b/packages/core/strapi/lib/commands/develop.js
index aa96471a3b..f484bd8fe4 100644
--- a/packages/core/strapi/lib/commands/develop.js
+++ b/packages/core/strapi/lib/commands/develop.js
@@ -20,8 +20,8 @@ module.exports = async function({ build, watchAdmin, polling, browser }) {
   const config = loadConfiguration(dir);
   const logger = createLogger(config.logger, {});
 
-  const adminWatchIgnoreFiles = getOr([], 'server.admin.watchIgnoreFiles')(config);
-  const serveAdminPanel = getOr(true, 'server.admin.serveAdminPanel')(config);
+  const adminWatchIgnoreFiles = getOr([], 'admin.watchIgnoreFiles')(config);
+  const serveAdminPanel = getOr(true, 'admin.serveAdminPanel')(config);
 
   const buildExists = fs.existsSync(path.join(dir, 'build'));
   // Don't run the build process if the admin is in watch mode
diff --git a/packages/core/strapi/lib/core/bootstrap.js b/packages/core/strapi/lib/core/bootstrap.js
index 0ddcee2fe5..4455152dda 100644
--- a/packages/core/strapi/lib/core/bootstrap.js
+++ b/packages/core/strapi/lib/core/bootstrap.js
@@ -15,7 +15,7 @@ module.exports = function({ strapi }) {
 
   // check if we should serve admin panel
   const shouldServeAdmin = strapi.config.get(
-    'server.admin.serveAdminPanel',
+    'admin.serveAdminPanel',
     strapi.config.get('serveAdminPanel')
   );