diff --git a/.changeset/moody-corners-help.md b/.changeset/moody-corners-help.md
new file mode 100644
index 0000000000..aa742ad34e
--- /dev/null
+++ b/.changeset/moody-corners-help.md
@@ -0,0 +1,4 @@
+---
+"@patternfly/pfe-tools": patch
+---
+Fix the manifest helper's demo `filePath` field.
diff --git a/docs/components.11tydata.cjs b/docs/components.11tydata.cjs
new file mode 100644
index 0000000000..5c968c42fb
--- /dev/null
+++ b/docs/components.11tydata.cjs
@@ -0,0 +1,14 @@
+module.exports = {
+  layout: 'layout-basic.njk',
+  templateEngineOverride: 'njk,md',
+  tags: ['component'],
+  permalink: '/components/{{ element.slug }}/index.html',
+  package: '{{ element.package }}',
+  description: '{{ element.description }}',
+  pagination: {
+    data: 'elements',
+    size: 1,
+    alias: 'element',
+    before: xs => xs.filter(x => !!x.docsTemplatePath),
+  },
+};
diff --git a/docs/components/components.md b/docs/components.md
similarity index 70%
rename from docs/components/components.md
rename to docs/components.md
index c121c174ec..dd9d4082fa 100644
--- a/docs/components/components.md
+++ b/docs/components.md
@@ -1,20 +1,3 @@
----js
-{
-  layout: 'layout-basic.njk',
-  templateEngineOverride: 'njk,md',
-  tags: ['component'],
-  permalink: '/components/{{ element.slug }}/index.html',
-  package: '{{ element.package }}',
-  description: '{{ element.description }}',
-  pagination: {
-    data: 'elements',
-    size: 1,
-    alias: 'element',
-    before: xs => xs.filter(x => !!x.docsTemplatePath),
-  }
-}
----
-
 <script type="module">
   const CLASS_KEY = 'html-lit-react-snippets';
   const LS_KEY = `${CLASS_KEY}-index`;
diff --git a/docs/components/demos.11tydata.cjs b/docs/components/demos.11tydata.cjs
index 449e25f0d6..ca77da79f0 100644
--- a/docs/components/demos.11tydata.cjs
+++ b/docs/components/demos.11tydata.cjs
@@ -1,3 +1,4 @@
+const { dirname } = require('path');
 module.exports = {
   templateEngineOverride: 'njk',
   permalink: '{{ demo.permalink }}',
@@ -5,6 +6,19 @@ module.exports = {
     data: 'demos',
     alias: 'demo',
     size: 1,
-    before: xs => xs.filter(x => x.permalink),
+    // somehow the main pf-icon demo is being printed twice.
+    // so we'll group by tag name, and only take the first of each.
+    before: demos => Object.values(Object.groupBy(demos
+        .filter(demo => demo.permalink?.includes(demo.tagName))
+        .map(demo => {
+          if (demo.filePath?.endsWith(`${demo.tagName}.html`)) {
+            return {
+              ...demo,
+              permalink: `${dirname(demo.permalink)}/`,
+            };
+          } else {
+            return demo;
+          }
+        }), demo => demo.tagName)).map(([x]) => x),
   },
 };
diff --git a/elements/.config/cem.yaml b/elements/.config/cem.yaml
index 2ae51063a1..9362bca3c4 100644
--- a/elements/.config/cem.yaml
+++ b/elements/.config/cem.yaml
@@ -9,6 +9,6 @@ generate:
   output: custom-elements.json
   noDefaultExcludes: false
   demoDiscovery:
-    fileGlob: ./*/demo/*.html
-    urlPattern: (?P<tag>[\\w-]+)/demo/(?P<demo>[\\w-]+).html
-    urlTemplate: https://patternflyelements.org/components/{tag}/{demo}/
+    fileGlob: '*/demo/*.html'
+    urlPattern: pf-(?P<tag>[\w-]+)/demo/(?P<demo>[\w-]+).html
+    urlTemplate: https://patternflyelements.org/components/{tag}/demo/{demo}/
diff --git a/package-lock.json b/package-lock.json
index e90bf24cf0..22c8a4b1c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@lit/react": "^1.0.5",
         "@octokit/core": "^6.1.2",
         "@patternfly/patternfly": "^4.224.5",
-        "@pwrs/cem": "^0.2.2",
+        "@pwrs/cem": "^0.2.3",
         "@rhds/elements": "^1.4.5",
         "@types/koa__router": "^12.0.4",
         "@types/node": "^22.15.32",
@@ -50,16 +50,16 @@
       "optionalDependencies": {
         "@esbuild/darwin-arm64": "^0.23.1",
         "@esbuild/linux-x64": "^0.23.1",
-        "@pwrs/cem-darwin-arm64": "^0.2.2",
-        "@pwrs/cem-darwin-x64": "^0.2.2",
-        "@pwrs/cem-linux-arm64": "^0.2.2",
-        "@pwrs/cem-linux-x64": "^0.2.2",
+        "@pwrs/cem-darwin-arm64": "^0.2.3",
+        "@pwrs/cem-darwin-x64": "^0.2.3",
+        "@pwrs/cem-linux-arm64": "^0.2.3",
+        "@pwrs/cem-linux-x64": "^0.2.3",
         "@rollup/rollup-darwin-arm64": "^4.21.0"
       }
     },
     "core/pfe-core": {
       "name": "@patternfly/pfe-core",
-      "version": "5.0.2",
+      "version": "5.0.3",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.6.10",
@@ -2908,9 +2908,9 @@
       }
     },
     "node_modules/@pwrs/cem": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@pwrs/cem/-/cem-0.2.2.tgz",
-      "integrity": "sha512-TNdJJWUvUFXqMT2N/OG46A1dbTV0UKAw8FzPfdAb5LkjMWoN1uFif6UBC02qBO9CrsO7ngAzzoArZsLu2MptMA==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@pwrs/cem/-/cem-0.2.3.tgz",
+      "integrity": "sha512-EtPwk5uoJX/FtnjcsGa58Pd2vN42pzEA4rq7xYS+4gOpvrjwUrK/e4uQ1wyBkE79iT721mwpZhCfNvT3jdVMvw==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -2920,18 +2920,18 @@
         "node": ">=22.0.0"
       },
       "optionalDependencies": {
-        "@pwrs/cem-darwin-arm64": "0.2.2",
-        "@pwrs/cem-darwin-x64": "0.2.2",
-        "@pwrs/cem-linux-arm64": "0.2.2",
-        "@pwrs/cem-linux-x64": "0.2.2",
-        "@pwrs/cem-win32-arm64": "0.2.2",
-        "@pwrs/cem-win32-x64": "0.2.2"
+        "@pwrs/cem-darwin-arm64": "0.2.3",
+        "@pwrs/cem-darwin-x64": "0.2.3",
+        "@pwrs/cem-linux-arm64": "0.2.3",
+        "@pwrs/cem-linux-x64": "0.2.3",
+        "@pwrs/cem-win32-arm64": "0.2.3",
+        "@pwrs/cem-win32-x64": "0.2.3"
       }
     },
     "node_modules/@pwrs/cem-darwin-arm64": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@pwrs/cem-darwin-arm64/-/cem-darwin-arm64-0.2.2.tgz",
-      "integrity": "sha512-+x5rrfSIVH0e5qGRWJDJt3XZFUlh9/1xg28dyIiaxvuT1y2ux41e5Q09epeEpWuRGLcAqnRyheLYZWNtZ2ORCA==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@pwrs/cem-darwin-arm64/-/cem-darwin-arm64-0.2.3.tgz",
+      "integrity": "sha512-vEVtA7ULjFA/ErxEIORkgfi7VKYSeULHO/T+Nsx2tfkkS26UYZgsOMtWidEDPgetoN0/pbT22i+ZMCXI+yOHeg==",
       "cpu": [
         "arm64"
       ],
@@ -2945,9 +2945,9 @@
       }
     },
     "node_modules/@pwrs/cem-darwin-x64": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@pwrs/cem-darwin-x64/-/cem-darwin-x64-0.2.2.tgz",
-      "integrity": "sha512-c7NPBk8v2KzcaTcIHqsPLqvUGb0Mh+vXTcIViR0SLPTJdeSSKJLCo2ZDd6YPXXxrSFgXc9f/42gr4zvhe8lM6g==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@pwrs/cem-darwin-x64/-/cem-darwin-x64-0.2.3.tgz",
+      "integrity": "sha512-wOJZwOTCNmcUmzianKNnqBt9sei54gil0G3b8w7yvsupUaxhd4qOazgUxpt/g070drNFQ94YvlYd5CMEnY8iTw==",
       "cpu": [
         "x64"
       ],
@@ -2961,9 +2961,9 @@
       }
     },
     "node_modules/@pwrs/cem-linux-arm64": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@pwrs/cem-linux-arm64/-/cem-linux-arm64-0.2.2.tgz",
-      "integrity": "sha512-6MR/SUbSs4QFUSHsht0X26BWCq3Jr3VSsM41H8bf7MljwkRf9G1JjG6BOTWGIVuiu3rWTk82skW3XbmQupgSlw==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@pwrs/cem-linux-arm64/-/cem-linux-arm64-0.2.3.tgz",
+      "integrity": "sha512-mHAcg2sSemq5WSK888PccSlO17P1dScpLYblzOxZVNpyILsIpmLrV8czqBzGVFvSK4S95QmkTBD9ziXTl1O84A==",
       "cpu": [
         "arm64"
       ],
@@ -2977,9 +2977,9 @@
       }
     },
     "node_modules/@pwrs/cem-linux-x64": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@pwrs/cem-linux-x64/-/cem-linux-x64-0.2.2.tgz",
-      "integrity": "sha512-4KeXT9f4+S/22tYCeekIZhs/bbyCwc+eP6u9PHhBFcPOvmmX27jTvs+U+JRw11C4ofCBoG3QqnRWJs8IkUE/Xw==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@pwrs/cem-linux-x64/-/cem-linux-x64-0.2.3.tgz",
+      "integrity": "sha512-iKC9ZXvMa8/P1obooT1kvwT2I6MyjU6Vj3K4ZXQ5FnbA+OBZq8S4/Y5ydUeWlHyNpgsu+IwRBsAKWKOz4hBXOw==",
       "cpu": [
         "x64"
       ],
@@ -2993,9 +2993,9 @@
       }
     },
     "node_modules/@pwrs/cem-win32-arm64": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@pwrs/cem-win32-arm64/-/cem-win32-arm64-0.2.2.tgz",
-      "integrity": "sha512-07GY5Emb+ZFq0aAeBMgjGM9gz9SlqNIFIbKxfZnQBuT5Whu0R7dZB4GkXRPFfAfTXdaZTr7rT8R7ezcDhx4L+Q==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@pwrs/cem-win32-arm64/-/cem-win32-arm64-0.2.3.tgz",
+      "integrity": "sha512-s1eTweuInPZyElmpQActA25cJxlmRY0FO1PfCGVBu+RtbygbiML7jujZnKRDbWssdfa+2cw6I9jnrv4isH9Dag==",
       "cpu": [
         "arm64"
       ],
@@ -3010,9 +3010,9 @@
       }
     },
     "node_modules/@pwrs/cem-win32-x64": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@pwrs/cem-win32-x64/-/cem-win32-x64-0.2.2.tgz",
-      "integrity": "sha512-c2LXxYSiyhTQ5xddbx+tgfXaxuaty7FthK1lvVAyPHNshSjI9NqJnDrX1choDRTpudpSLWq/7PAK4pZiKMOIag==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@pwrs/cem-win32-x64/-/cem-win32-x64-0.2.3.tgz",
+      "integrity": "sha512-HMHZjbxE51hDB43Gww+2QZvCU1o7ZTJjmdIy7rsAA167vxY5J//F8ElaO7I/fH9JRrzSOyPadkEbX0JHyye/zQ==",
       "cpu": [
         "x64"
       ],
@@ -17398,7 +17398,7 @@
     },
     "tools/pfe-tools": {
       "name": "@patternfly/pfe-tools",
-      "version": "4.0.3",
+      "version": "5.0.1",
       "license": "MIT",
       "devDependencies": {
         "@types/dedent": "^0.7.2",
diff --git a/package.json b/package.json
index e112e2ce10..657bc129c3 100644
--- a/package.json
+++ b/package.json
@@ -290,7 +290,7 @@
     "@lit/react": "^1.0.5",
     "@octokit/core": "^6.1.2",
     "@patternfly/patternfly": "^4.224.5",
-    "@pwrs/cem": "^0.2.2",
+    "@pwrs/cem": "^0.2.3",
     "@rhds/elements": "^1.4.5",
     "@types/koa__router": "^12.0.4",
     "@types/node": "^22.15.32",
@@ -316,10 +316,10 @@
   "optionalDependencies": {
     "@esbuild/darwin-arm64": "^0.23.1",
     "@esbuild/linux-x64": "^0.23.1",
-    "@pwrs/cem-darwin-arm64": "^0.2.2",
-    "@pwrs/cem-darwin-x64": "^0.2.2",
-    "@pwrs/cem-linux-arm64": "^0.2.2",
-    "@pwrs/cem-linux-x64": "^0.2.2",
+    "@pwrs/cem-darwin-arm64": "^0.2.3",
+    "@pwrs/cem-darwin-x64": "^0.2.3",
+    "@pwrs/cem-linux-arm64": "^0.2.3",
+    "@pwrs/cem-linux-x64": "^0.2.3",
     "@rollup/rollup-darwin-arm64": "^4.21.0"
   },
   "workspaces": [
diff --git a/tools/pfe-tools/custom-elements-manifest/lib/Manifest.ts b/tools/pfe-tools/custom-elements-manifest/lib/Manifest.ts
index fda3216c83..f12848a82f 100644
--- a/tools/pfe-tools/custom-elements-manifest/lib/Manifest.ts
+++ b/tools/pfe-tools/custom-elements-manifest/lib/Manifest.ts
@@ -314,7 +314,11 @@ export class Manifest {
       // strict removes all special characters from slug
       slug = slugify(slug, { strict: true, lower: true });
       const primaryElementName = deslugify(slug, options.rootDir);
-      const filePath = demo.source?.href.replace(options.sourceControlURLPrefix, `${options.rootDir}/`) ?? '';
+      const filePath =
+        demo.source?.href.replace(
+          options.sourceControlURLPrefix,
+          `${join(options.rootDir, options.elementsDir)}/`,
+        ) ?? '';
       const [last = ''] = filePath.split('/').reverse();
       const filename = last.replace('.html', '');
       const isMainElementDemo = this.getTagNames().includes(filename);
diff --git a/tools/pfe-tools/dev-server/config.ts b/tools/pfe-tools/dev-server/config.ts
index 5c2cf90f7c..6bd91086e8 100644
--- a/tools/pfe-tools/dev-server/config.ts
+++ b/tools/pfe-tools/dev-server/config.ts
@@ -23,6 +23,7 @@ import { join } from 'node:path';
 const replace = fromRollup(rollupReplace);
 
 type BaseConfig = DevServerConfig & PfeConfig;
+
 export interface PfeDevServerConfigOptions extends BaseConfig {
   hostname?: string;
   litcssOptions?: LitCSSOptions;
diff --git a/tools/pfe-tools/dev-server/plugins/dev-server-templates.ts b/tools/pfe-tools/dev-server/plugins/dev-server-templates.ts
index df856c2908..4798928c8a 100644
--- a/tools/pfe-tools/dev-server/plugins/dev-server-templates.ts
+++ b/tools/pfe-tools/dev-server/plugins/dev-server-templates.ts
@@ -36,7 +36,18 @@ async function getDemos(config: PfeDevServerInternalConfig) {
         manifest
             .getTagNames()
             .flatMap(tagName =>
-              manifest.getDemoMetadata(tagName, config as PfeDevServerInternalConfig)));
+              manifest.getDemoMetadata(tagName, config as PfeDevServerInternalConfig)
+                  .filter(demo => demo.filePath?.includes(tagName))
+                  .map(demo => {
+                    if (demo.filePath?.endsWith(`${tagName}.html`) || demo.filePath?.endsWith('index.html')) {
+                      return {
+                        ...demo,
+                        permalink: dirname(demo.permalink),
+                      };
+                    } else {
+                      return demo;
+                    }
+                  })));
 }
 
 async function getTemplateContent(demo?: DemoRecord) {
@@ -76,5 +87,3 @@ export function pfeDevServerTemplateMiddleware(config: PfeDevServerInternalConfi
     return next();
   };
 }
-
-