diff --git a/docs/DOCS_CLAUDE.md b/docs/DOCS_CLAUDE.md
index 3e60b73b0d3..576f334d258 100644
--- a/docs/DOCS_CLAUDE.md
+++ b/docs/DOCS_CLAUDE.md
@@ -52,11 +52,11 @@ yarn serve                # Serve built site locally
 # For maximum-detail databases.json, drop the `database-diagnostics`
 # artifact from Python-Integration CI at src/data/databases.json before
 # cutting. See README.md "Before You Cut".
-yarn version:add:docs <version>              # Add new docs version
+yarn version:add:user_docs <version>              # Add new docs version
 yarn version:add:admin_docs <version>        # Add admin docs version
 yarn version:add:developer_docs <version>    # Add developer docs version
 yarn version:add:components <version>        # Add components version
-yarn version:remove:docs <version>           # Remove docs version
+yarn version:remove:user_docs <version>           # Remove docs version
 yarn version:remove:admin_docs <version>     # Remove admin docs version
 yarn version:remove:developer_docs <version> # Remove developer docs version
 yarn version:remove:components <version>     # Remove components version
@@ -228,17 +228,20 @@ Versions are managed through `versions-config.json`:
 
 ```bash
 # ✅ CORRECT - Updates both Docusaurus and versions-config.json
-yarn version:add:docs 6.1.0
+yarn version:add:user_docs 6.1.0
 
 # ❌ WRONG - Only updates Docusaurus, breaks version dropdown
 yarn docusaurus docs:version 6.1.0
 ```
 
 ### Version Files Created
-When versioning, these files are created:
-- `versioned_docs/version-X.X.X/` - Snapshot of current docs
-- `versioned_sidebars/version-X.X.X-sidebars.json` - Sidebar config
-- `versions.json` - List of all versions
+When versioning, these files are created (per section, with the
+section's plugin id as prefix):
+- `<section>_versioned_docs/version-X.X.X/` - Snapshot of current docs
+- `<section>_versioned_sidebars/version-X.X.X-sidebars.json` - Sidebar config
+- `<section>_versions.json` - List of all versions
+
+Section plugin ids: `user_docs`, `admin_docs`, `developer_docs`, `components`.
 
 ## 🎨 Styling and Theming
 
@@ -386,7 +389,7 @@ Docusaurus includes Algolia DocSearch integration configured in `docusaurus.conf
 
 ## 🚫 Common Pitfalls to Avoid
 
-1. **Never use `yarn docusaurus docs:version`** - Use `yarn version:add:docs` instead
+1. **Never use `yarn docusaurus docs:version`** - Use `yarn version:add:user_docs` instead
 2. **Don't edit versioned docs directly** - Edit current docs and create new version
 3. **Avoid absolute paths in links** - Use relative paths for maintainability
 4. **Don't forget frontmatter** - Every doc needs title and description
@@ -416,7 +419,7 @@ yarn eslint
 ### Version Issues
 If versions don't appear in dropdown:
 1. Check `versions-config.json` includes the version
-2. Verify version files exist in `versioned_docs/`
+2. Verify version files exist in `<section>_versioned_docs/`
 3. Restart dev server
 
 ## 📚 Resources
diff --git a/docs/README.md b/docs/README.md
index f5b8e719445..634799d4bc6 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -53,7 +53,7 @@ Also: confirm `master` CI is green, and that your local checkout matches the SHA
 
 ```bash
 # Main Documentation
-yarn version:add:docs 1.2.0
+yarn version:add:user_docs 1.2.0
 
 # Admin Docs
 yarn version:add:admin_docs 1.2.0
@@ -98,7 +98,7 @@ If creating versions manually, you'll need to:
    - **Versioned sidebars**: `[section]_versioned_sidebars/version-X.X.X-sidebars.json`
    - **Versions list**: `[section]_versions.json`
 
-   Note: For main docs, the prefix is omitted (e.g., `versioned_docs/` instead of `docs_versioned_docs/`)
+   All four sections (`user_docs`, `admin_docs`, `developer_docs`, `components`) follow this naming pattern uniformly.
 
 3. **Important**: After adding a version, restart the development server to see changes:
    ```bash
@@ -111,7 +111,7 @@ If creating versions manually, you'll need to:
 #### Using Automated Scripts (Recommended)
 ```bash
 # Main Documentation
-yarn version:remove:docs 1.0.0
+yarn version:remove:user_docs 1.0.0
 
 # Admin Docs
 yarn version:remove:admin_docs 1.0.0
@@ -127,19 +127,19 @@ yarn version:remove:components 1.0.0
 To manually remove a version:
 
 1. **Delete the version folder** from the appropriate location:
-   - Main docs: `versioned_docs/version-X.X.X/` (no prefix for main)
+   - User Docs: `user_docs_versioned_docs/version-X.X.X/`
    - Admin Docs: `admin_docs_versioned_docs/version-X.X.X/`
    - Developer Docs: `developer_docs_versioned_docs/version-X.X.X/`
    - Components: `components_versioned_docs/version-X.X.X/`
 
 2. **Delete the version metadata file**:
-   - Main docs: `versioned_sidebars/version-X.X.X-sidebars.json` (no prefix)
+   - User Docs: `user_docs_versioned_sidebars/version-X.X.X-sidebars.json`
    - Admin Docs: `admin_docs_versioned_sidebars/version-X.X.X-sidebars.json`
    - Developer Docs: `developer_docs_versioned_sidebars/version-X.X.X-sidebars.json`
    - Components: `components_versioned_sidebars/version-X.X.X-sidebars.json`
 
 3. **Update the versions list file**:
-   - Main docs: `versions.json`
+   - User Docs: `user_docs_versions.json`
    - Admin Docs: `admin_docs_versions.json`
    - Developer Docs: `developer_docs_versions.json`
    - Components: `components_versions.json`
@@ -212,8 +212,8 @@ docs: {
 If you accidentally used `yarn docusaurus docs:version` instead of `yarn version:add`:
 1. **Problem**: The version files were created but `versions-config.json` wasn't updated
 2. **Solution**: Either:
-   - Revert the changes: `git restore versions.json && rm -rf versioned_docs/ versioned_sidebars/`
-   - Then use the correct command: `yarn version:add:docs <version>`
+   - Revert the changes: `git restore user_docs_versions.json && rm -rf user_docs_versioned_docs/ user_docs_versioned_sidebars/`
+   - Then use the correct command: `yarn version:add:user_docs <version>`
 
 For other issues:
 - **Restart the server**: Changes to version configuration require a server restart
diff --git a/docs/docusaurus.config.ts b/docs/docusaurus.config.ts
index 5a6c5b023c7..8c226188f6d 100644
--- a/docs/docusaurus.config.ts
+++ b/docs/docusaurus.config.ts
@@ -36,6 +36,42 @@ const versionsConfig = JSON.parse(fs.readFileSync(versionsConfigPath, 'utf8'));
 // Build plugins array dynamically based on disabled flags
 const dynamicPlugins = [];
 
+// Add user_docs (formerly the preset-classic default docs instance) as an
+// explicit plugin instance, so its versioned dirs follow the same
+// `<id>_versioned_docs` / `<id>_versioned_sidebars` / `<id>_versions.json`
+// naming as the other sections instead of the bare `versioned_*` prefix
+// Docusaurus uses for the default plugin id.
+if (!versionsConfig.user_docs.disabled) {
+  dynamicPlugins.push([
+    '@docusaurus/plugin-content-docs',
+    {
+      id: 'user_docs',
+      path: 'docs',
+      routeBasePath: 'user-docs',
+      sidebarPath: require.resolve('./sidebars.js'),
+      editUrl: ({ versionDocsDirPath, docPath }: { versionDocsDirPath: string; docPath: string }) => {
+        if (docPath === 'intro.md') {
+          return 'https://github.com/apache/superset/edit/master/README.md';
+        }
+        return `https://github.com/apache/superset/edit/master/docs/${versionDocsDirPath}/${docPath}`;
+      },
+      remarkPlugins: [remarkImportPartial, remarkLocalizeBadges, remarkTechArticleSchema],
+      admonitions: {
+        keywords: ['note', 'tip', 'info', 'warning', 'danger', 'resources'],
+        extendDefaults: true,
+      },
+      docItemComponent: '@theme/DocItem',
+      includeCurrentVersion: versionsConfig.user_docs.includeCurrentVersion,
+      lastVersion: versionsConfig.user_docs.lastVersion,
+      onlyIncludeVersions: versionsConfig.user_docs.onlyIncludeVersions,
+      versions: versionsConfig.user_docs.versions,
+      disableVersioning: false,
+      showLastUpdateAuthor: true,
+      showLastUpdateTime: true,
+    },
+  ]);
+}
+
 // Add components plugin if not disabled
 if (!versionsConfig.components.disabled) {
   dynamicPlugins.push([
@@ -703,29 +739,12 @@ const config: Config = {
     [
       '@docusaurus/preset-classic',
       {
-        docs: {
-          routeBasePath: 'user-docs',
-          sidebarPath: require.resolve('./sidebars.js'),
-          editUrl: ({ versionDocsDirPath, docPath }) => {
-            if (docPath === 'intro.md') {
-              return 'https://github.com/apache/superset/edit/master/README.md';
-            }
-            return `https://github.com/apache/superset/edit/master/docs/${versionDocsDirPath}/${docPath}`;
-          },
-          remarkPlugins: [remarkImportPartial, remarkLocalizeBadges, remarkTechArticleSchema],
-          admonitions: {
-            keywords: ['note', 'tip', 'info', 'warning', 'danger', 'resources'],
-            extendDefaults: true,
-          },
-          includeCurrentVersion: versionsConfig.docs.includeCurrentVersion,
-          lastVersion: versionsConfig.docs.lastVersion,  // Make 'next' the default
-          onlyIncludeVersions: versionsConfig.docs.onlyIncludeVersions,
-          versions: versionsConfig.docs.versions,
-          disableVersioning: false,
-          showLastUpdateAuthor: true,
-          showLastUpdateTime: true,
-          docItemComponent: '@theme/DocItem',
-        },
+        // The user-docs section is configured as an explicit plugin
+        // instance above (id: 'user_docs') rather than the preset's
+        // default docs slot, so that all four sections use parallel
+        // `<id>_versioned_docs` / `<id>_versioned_sidebars` /
+        // `<id>_versions.json` naming on disk.
+        docs: false,
         blog: {
           showReadingTime: true,
           // Please change this to your repo.
diff --git a/docs/package.json b/docs/package.json
index f8bf2b13689..6e0ff67eff4 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -33,11 +33,11 @@
     "lint:docs-links": "node scripts/lint-docs-links.mjs",
     "version:add": "node scripts/manage-versions.mjs add",
     "version:remove": "node scripts/manage-versions.mjs remove",
-    "version:add:docs": "node scripts/manage-versions.mjs add docs",
+    "version:add:user_docs": "node scripts/manage-versions.mjs add user_docs",
     "version:add:admin_docs": "node scripts/manage-versions.mjs add admin_docs",
     "version:add:developer_docs": "node scripts/manage-versions.mjs add developer_docs",
     "version:add:components": "node scripts/manage-versions.mjs add components",
-    "version:remove:docs": "node scripts/manage-versions.mjs remove docs",
+    "version:remove:user_docs": "node scripts/manage-versions.mjs remove user_docs",
     "version:remove:admin_docs": "node scripts/manage-versions.mjs remove admin_docs",
     "version:remove:developer_docs": "node scripts/manage-versions.mjs remove developer_docs",
     "version:remove:components": "node scripts/manage-versions.mjs remove components"
diff --git a/docs/scripts/manage-versions.mjs b/docs/scripts/manage-versions.mjs
index 2318344157c..11f90285460 100644
--- a/docs/scripts/manage-versions.mjs
+++ b/docs/scripts/manage-versions.mjs
@@ -34,7 +34,7 @@ const rawArgs = process.argv.slice(2);
 const skipGenerate = rawArgs.includes('--skip-generate');
 const args = rawArgs.filter((a) => a !== '--skip-generate');
 const command = args[0]; // 'add' or 'remove'
-const section = args[1]; // 'docs', 'admin_docs', 'developer_docs', or 'components'
+const section = args[1]; // 'user_docs', 'admin_docs', 'developer_docs', or 'components'
 const version = args[2]; // version string like '1.2.0'
 
 function loadConfig() {
@@ -54,13 +54,13 @@ function freezeDataImports(section, version) {
   // historical version's content silently changes whenever the data file
   // is updated. Copy each escaping data import into a snapshot-local
   // `_versioned_data/` dir and rewrite the import to point there.
-  const sectionRoot = section === 'docs'
-    ? path.join(__dirname, '..', 'docs')
-    : path.join(__dirname, '..', section);
+  // The user_docs section's source content lives in `docs/docs/` (the
+  // historical folder name), while admin_docs / developer_docs /
+  // components match their plugin id 1:1.
+  const sectionDir = section === 'user_docs' ? 'docs' : section;
+  const sectionRoot = path.join(__dirname, '..', sectionDir);
   const docsRoot = path.join(__dirname, '..');
-  const versionedDocsDir = section === 'docs'
-    ? `versioned_docs/version-${version}`
-    : `${section}_versioned_docs/version-${version}`;
+  const versionedDocsDir = `${section}_versioned_docs/version-${version}`;
   const versionedDocsPath = path.join(__dirname, '..', versionedDocsDir);
   const frozenDataDir = path.join(versionedDocsPath, '_versioned_data');
 
@@ -148,9 +148,7 @@ function fixVersionedImports(section, version) {
   // Versioned content lands one directory deeper than the source content,
   // so any `../../src/` or `../../data/` imports in .md/.mdx files need
   // an extra `../` to keep reaching docs/src and docs/data.
-  const versionedDocsDir = section === 'docs'
-    ? `versioned_docs/version-${version}`
-    : `${section}_versioned_docs/version-${version}`;
+  const versionedDocsDir = `${section}_versioned_docs/version-${version}`;
   const versionedDocsPath = path.join(__dirname, '..', versionedDocsDir);
 
   if (!fs.existsSync(versionedDocsPath)) {
@@ -238,9 +236,7 @@ function addVersion(section, version) {
   }
 
   // Run Docusaurus version command
-  const docusaurusCommand = section === 'docs'
-    ? `yarn docusaurus docs:version ${version}`
-    : `yarn docusaurus docs:version:${section} ${version}`;
+  const docusaurusCommand = `yarn docusaurus docs:version:${section} ${version}`;
 
   try {
     execSync(docusaurusCommand, { stdio: 'inherit' });
@@ -262,10 +258,9 @@ function addVersion(section, version) {
   config[section].onlyIncludeVersions.splice(versionIndex, 0, version);
 
   // Add version metadata
-  const versionPath = section === 'docs' ? version : version;
   config[section].versions[version] = {
     label: version,
-    path: versionPath,
+    path: version,
     banner: 'none'
   };
 
@@ -305,13 +300,8 @@ function removeVersion(section, version) {
   console.log(`Removing version ${version} from ${section}...`);
 
   // Determine file paths based on section
-  const versionedDocsDir = section === 'docs'
-    ? `versioned_docs/version-${version}`
-    : `${section}_versioned_docs/version-${version}`;
-
-  const versionedSidebarsFile = section === 'docs'
-    ? `versioned_sidebars/version-${version}-sidebars.json`
-    : `${section}_versioned_sidebars/version-${version}-sidebars.json`;
+  const versionedDocsDir = `${section}_versioned_docs/version-${version}`;
+  const versionedSidebarsFile = `${section}_versioned_sidebars/version-${version}-sidebars.json`;
 
   // Remove versioned files
   const docsPath = path.join(__dirname, '..', versionedDocsDir);
@@ -328,9 +318,7 @@ function removeVersion(section, version) {
   }
 
   // Update versions.json file
-  const versionsJsonFile = section === 'docs'
-    ? 'versions.json'
-    : `${section}_versions.json`;
+  const versionsJsonFile = `${section}_versions.json`;
   const versionsJsonPath = path.join(__dirname, '..', versionsJsonFile);
 
   if (fs.existsSync(versionsJsonPath)) {
@@ -377,14 +365,14 @@ Usage:
   node scripts/manage-versions.mjs remove <section> <version>
 
 Where:
-  - section: 'docs', 'developer_docs', 'admin_docs', or 'components'
+  - section: 'user_docs', 'admin_docs', 'developer_docs', or 'components'
   - version: version string (e.g., '1.2.0', '2.0.0')
   - --skip-generate: skip refreshing auto-generated docs before snapshotting
                      (use when you've already placed a fresh databases.json
                      from CI and want to preserve it)
 
 Examples:
-  node scripts/manage-versions.mjs add docs 2.0.0
+  node scripts/manage-versions.mjs add user_docs 2.0.0
   node scripts/manage-versions.mjs add developer_docs 1.3.0
   node scripts/manage-versions.mjs remove components 1.0.0
 `);
diff --git a/docs/src/theme/DocVersionBadge/index.js b/docs/src/theme/DocVersionBadge/index.js
index 23b87463cb5..13281efcbb6 100644
--- a/docs/src/theme/DocVersionBadge/index.js
+++ b/docs/src/theme/DocVersionBadge/index.js
@@ -31,17 +31,15 @@ import { DownOutlined } from '@ant-design/icons';
 import styles from './styles.module.css';
 
 // Map each versioned plugin id to the URL prefix it actually serves
-// content from. Three of the four routeBasePath values differ from
-// their pluginId — the default preset-classic docs plugin lives at
-// `/user-docs`, and admin_docs / developer_docs use hyphens in their
-// URLs even though the plugin ids use underscores. Without this map
-// the basePath derivation below would mis-split the pathname for
-// those sections and the version dropdown would jump to the section
-// root instead of preserving the current page.
+// content from. The plugin ids use underscores while several
+// routeBasePath values use hyphens (and `user_docs` → `/user-docs`),
+// so without this map the basePath derivation below would mis-split
+// the pathname for those sections and the version dropdown would
+// jump to the section root instead of preserving the current page.
 //
 // Keep in sync with the `routeBasePath` values in docusaurus.config.ts.
 const PLUGIN_ID_TO_BASE_PATH = {
-  default: '/user-docs',
+  user_docs: '/user-docs',
   components: '/components',
   admin_docs: '/admin-docs',
   developer_docs: '/developer-docs',
diff --git a/docs/versioned_docs/version-6.0.0/api.mdx b/docs/user_docs_versioned_docs/version-6.0.0/api.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/api.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/api.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/alerts-reports.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/alerts-reports.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/alerts-reports.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/alerts-reports.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/async-queries-celery.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/async-queries-celery.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/async-queries-celery.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/async-queries-celery.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/cache.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/cache.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/cache.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/cache.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/configuring-superset.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/configuring-superset.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/configuring-superset.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/configuring-superset.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/country-map-tools.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/country-map-tools.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/country-map-tools.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/country-map-tools.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/databases.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/databases.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/databases.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/databases.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/event-logging.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/event-logging.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/event-logging.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/event-logging.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/importing-exporting-datasources.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/importing-exporting-datasources.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/importing-exporting-datasources.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/importing-exporting-datasources.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/map-tiles.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/map-tiles.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/map-tiles.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/map-tiles.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/networking-settings.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/networking-settings.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/networking-settings.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/networking-settings.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/sql-templating.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/sql-templating.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/sql-templating.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/sql-templating.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/theming.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/theming.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/theming.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/theming.mdx
diff --git a/docs/versioned_docs/version-6.0.0/configuration/timezones.mdx b/docs/user_docs_versioned_docs/version-6.0.0/configuration/timezones.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/configuration/timezones.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/configuration/timezones.mdx
diff --git a/docs/versioned_docs/version-6.0.0/contributing/contributing.mdx b/docs/user_docs_versioned_docs/version-6.0.0/contributing/contributing.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/contributing/contributing.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/contributing/contributing.mdx
diff --git a/docs/versioned_docs/version-6.0.0/contributing/development.mdx b/docs/user_docs_versioned_docs/version-6.0.0/contributing/development.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/contributing/development.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/contributing/development.mdx
diff --git a/docs/versioned_docs/version-6.0.0/contributing/guidelines.mdx b/docs/user_docs_versioned_docs/version-6.0.0/contributing/guidelines.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/contributing/guidelines.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/contributing/guidelines.mdx
diff --git a/docs/versioned_docs/version-6.0.0/contributing/howtos.mdx b/docs/user_docs_versioned_docs/version-6.0.0/contributing/howtos.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/contributing/howtos.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/contributing/howtos.mdx
diff --git a/docs/versioned_docs/version-6.0.0/contributing/misc.mdx b/docs/user_docs_versioned_docs/version-6.0.0/contributing/misc.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/contributing/misc.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/contributing/misc.mdx
diff --git a/docs/versioned_docs/version-6.0.0/contributing/resources.mdx b/docs/user_docs_versioned_docs/version-6.0.0/contributing/resources.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/contributing/resources.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/contributing/resources.mdx
diff --git a/docs/versioned_docs/version-6.0.0/faq.mdx b/docs/user_docs_versioned_docs/version-6.0.0/faq.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/faq.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/faq.mdx
diff --git a/docs/versioned_docs/version-6.0.0/installation/architecture.mdx b/docs/user_docs_versioned_docs/version-6.0.0/installation/architecture.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/installation/architecture.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/installation/architecture.mdx
diff --git a/docs/versioned_docs/version-6.0.0/installation/docker-builds.mdx b/docs/user_docs_versioned_docs/version-6.0.0/installation/docker-builds.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/installation/docker-builds.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/installation/docker-builds.mdx
diff --git a/docs/versioned_docs/version-6.0.0/installation/docker-compose.mdx b/docs/user_docs_versioned_docs/version-6.0.0/installation/docker-compose.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/installation/docker-compose.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/installation/docker-compose.mdx
diff --git a/docs/versioned_docs/version-6.0.0/installation/installation-methods.mdx b/docs/user_docs_versioned_docs/version-6.0.0/installation/installation-methods.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/installation/installation-methods.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/installation/installation-methods.mdx
diff --git a/docs/versioned_docs/version-6.0.0/installation/kubernetes.mdx b/docs/user_docs_versioned_docs/version-6.0.0/installation/kubernetes.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/installation/kubernetes.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/installation/kubernetes.mdx
diff --git a/docs/versioned_docs/version-6.0.0/installation/pypi.mdx b/docs/user_docs_versioned_docs/version-6.0.0/installation/pypi.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/installation/pypi.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/installation/pypi.mdx
diff --git a/docs/versioned_docs/version-6.0.0/installation/upgrading-superset.mdx b/docs/user_docs_versioned_docs/version-6.0.0/installation/upgrading-superset.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/installation/upgrading-superset.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/installation/upgrading-superset.mdx
diff --git a/docs/versioned_docs/version-6.0.0/intro.md b/docs/user_docs_versioned_docs/version-6.0.0/intro.md
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/intro.md
rename to docs/user_docs_versioned_docs/version-6.0.0/intro.md
diff --git a/docs/versioned_docs/version-6.0.0/quickstart.mdx b/docs/user_docs_versioned_docs/version-6.0.0/quickstart.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/quickstart.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/quickstart.mdx
diff --git a/docs/versioned_docs/version-6.0.0/security/cves.mdx b/docs/user_docs_versioned_docs/version-6.0.0/security/cves.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/security/cves.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/security/cves.mdx
diff --git a/docs/versioned_docs/version-6.0.0/security/security.mdx b/docs/user_docs_versioned_docs/version-6.0.0/security/security.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/security/security.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/security/security.mdx
diff --git a/docs/versioned_docs/version-6.0.0/using-superset/creating-your-first-dashboard.mdx b/docs/user_docs_versioned_docs/version-6.0.0/using-superset/creating-your-first-dashboard.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/using-superset/creating-your-first-dashboard.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/using-superset/creating-your-first-dashboard.mdx
diff --git a/docs/versioned_docs/version-6.0.0/using-superset/exploring-data.mdx b/docs/user_docs_versioned_docs/version-6.0.0/using-superset/exploring-data.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/using-superset/exploring-data.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/using-superset/exploring-data.mdx
diff --git a/docs/versioned_docs/version-6.0.0/using-superset/issue-codes.mdx b/docs/user_docs_versioned_docs/version-6.0.0/using-superset/issue-codes.mdx
similarity index 100%
rename from docs/versioned_docs/version-6.0.0/using-superset/issue-codes.mdx
rename to docs/user_docs_versioned_docs/version-6.0.0/using-superset/issue-codes.mdx
diff --git a/docs/versioned_sidebars/version-6.0.0-sidebars.json b/docs/user_docs_versioned_sidebars/version-6.0.0-sidebars.json
similarity index 100%
rename from docs/versioned_sidebars/version-6.0.0-sidebars.json
rename to docs/user_docs_versioned_sidebars/version-6.0.0-sidebars.json
diff --git a/docs/versions.json b/docs/user_docs_versions.json
similarity index 100%
rename from docs/versions.json
rename to docs/user_docs_versions.json
diff --git a/docs/versions-config.json b/docs/versions-config.json
index 985b075e669..5aca8d2cca0 100644
--- a/docs/versions-config.json
+++ b/docs/versions-config.json
@@ -1,5 +1,5 @@
 {
-  "docs": {
+  "user_docs": {
     "disabled": false,
     "lastVersion": "current",
     "includeCurrentVersion": true,