diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index d7c5191fa8..4b792f976f 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -35,10 +35,10 @@ jobs:
         run: |
           cp -R packages/plugins/doc packages/distribution/build/plugin-doc
 
-      - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@4.1.5
-        with:
-          branch: master
-          folder: packages/distribution/build
-          repository-name: openscd/openscd.github.io
-          ssh-key: ${{ secrets.DEPLOY_KEY }}
+      # - name: Deploy
+      #   uses: JamesIves/github-pages-deploy-action@4.1.5
+      #   with:
+      #     branch: master
+      #     folder: packages/distribution/build
+      #     repository-name: openscd/openscd.github.io
+      #     ssh-key: ${{ secrets.DEPLOY_KEY }}
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 76ab0723e5..f60afa1540 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -16,7 +16,6 @@ jobs:
         id: release
         with:
           release-type: node
-          command: manifest
           token: ${{ secrets.GITHUB_TOKEN }}
       # The logic below handles the npm publication:
       - uses: actions/checkout@v4
@@ -32,7 +31,39 @@ jobs:
         if: ${{ steps.release.outputs.release_created }}
       - run: npm run build
         if: ${{ steps.release.outputs.release_created }}
-      - run: cd packages/core && npm publish --access public
+        
+      - name: Publish core to npm
+        run: cd packages/core && npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+        if: ${{ steps.release.outputs.release_created }}
+        continue-on-error: true
+      - name: Publish addons to npm
+        run: cd packages/addons && npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+        if: ${{ steps.release.outputs.release_created }}
+        continue-on-error: true
+      - name: Publish forms to npm
+        run: cd packages/forms && npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+        if: ${{ steps.release.outputs.release_created }}
+        continue-on-error: true
+      - name: Publish wizards to npm
+        run: cd packages/wizards && npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+        if: ${{ steps.release.outputs.release_created }}
+        continue-on-error: true
+      - name: Publish xml to npm
+        run: cd packages/xml && npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+        if: ${{ steps.release.outputs.release_created }}
+        continue-on-error: true
+      - name: Publish open-scd to npm
+        run: cd packages/openscd && npm publish --access public
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
         if: ${{ steps.release.outputs.release_created }}
diff --git a/package-lock.json b/package-lock.json
index cb8756a38a..36139fba04 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2580,6 +2580,30 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@compas-oscd/addons": {
+      "resolved": "packages/addons",
+      "link": true
+    },
+    "node_modules/@compas-oscd/core": {
+      "resolved": "packages/core",
+      "link": true
+    },
+    "node_modules/@compas-oscd/forms": {
+      "resolved": "packages/forms",
+      "link": true
+    },
+    "node_modules/@compas-oscd/open-scd": {
+      "resolved": "packages/openscd",
+      "link": true
+    },
+    "node_modules/@compas-oscd/wizards": {
+      "resolved": "packages/wizards",
+      "link": true
+    },
+    "node_modules/@compas-oscd/xml": {
+      "resolved": "packages/xml",
+      "link": true
+    },
     "node_modules/@custom-elements-manifest/analyzer": {
       "version": "0.6.9",
       "resolved": "https://registry.npmjs.org/@custom-elements-manifest/analyzer/-/analyzer-0.6.9.tgz",
@@ -7081,10 +7105,6 @@
       "integrity": "sha512-l8D7boLoUpP+C/J2ue7aY/12euRtK2k4EYKsyysoFto9sySCnlX/KWom5ruP7MtH8n0BEMSUuFg1gKfC+lD80Q==",
       "license": "Apache-2.0"
     },
-    "node_modules/@openscd/addons": {
-      "resolved": "packages/addons",
-      "link": true
-    },
     "node_modules/@openscd/core": {
       "resolved": "packages/core",
       "link": true
@@ -7093,10 +7113,6 @@
       "resolved": "packages/distribution",
       "link": true
     },
-    "node_modules/@openscd/forms": {
-      "resolved": "packages/forms",
-      "link": true
-    },
     "node_modules/@openscd/open-scd": {
       "resolved": "packages/openscd",
       "link": true
@@ -29922,11 +29938,11 @@
       }
     },
     "packages/addons": {
-      "name": "@openscd/addons",
+      "name": "@compas-oscd/addons",
       "version": "0.34.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@openscd/core": "*",
+        "@openscd/core": "npm:@compas-oscd/core@*",
         "lit": "^2.2.7"
       },
       "devDependencies": {
@@ -31158,7 +31174,7 @@
       }
     },
     "packages/core": {
-      "name": "@openscd/core",
+      "name": "@compas-oscd/core",
       "version": "0.1.4",
       "license": "Apache-2.0",
       "dependencies": {
@@ -31328,8 +31344,8 @@
       "version": "0.0.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@openscd/addons": "*",
-        "@openscd/open-scd": "*",
+        "@compas-oscd/addons": "npm:@compas-oscd/addons@*",
+        "@compas-oscd/open-scd": "npm:@compas-oscd/open-scd@*",
         "@openscd/plugins": "*"
       },
       "devDependencies": {
@@ -32571,7 +32587,7 @@
       }
     },
     "packages/forms": {
-      "name": "@openscd/forms",
+      "name": "@compas-oscd/forms",
       "version": "0.0.1",
       "license": "Apache-2.0",
       "devDependencies": {
@@ -32649,7 +32665,7 @@
       }
     },
     "packages/openscd": {
-      "name": "@openscd/open-scd",
+      "name": "@compas-oscd/open-scd",
       "version": "0.34.0",
       "license": "Apache-2.0",
       "dependencies": {
@@ -32671,9 +32687,9 @@
         "@material/mwc-textarea": "0.22.1",
         "@material/mwc-textfield": "0.22.1",
         "@material/mwc-top-app-bar-fixed": "0.22.1",
-        "@openscd/core": "*",
+        "@openscd/core": "npm:@compas-oscd/core@*",
         "@openscd/oscd-api": "^0.1.5",
-        "@openscd/xml": "*",
+        "@openscd/xml": "npm:@compas-oscd/xml@*",
         "ace-custom-element": "^1.6.5",
         "lit": "^2.2.7",
         "lit-translate": "^1.2.1",
@@ -34129,10 +34145,10 @@
         "@material/mwc-textarea": "0.22.1",
         "@material/mwc-textfield": "0.22.1",
         "@openenergytools/scl-lib": "^1.8.0",
-        "@openscd/core": "*",
-        "@openscd/open-scd": "*",
-        "@openscd/wizards": "*",
-        "@openscd/xml": "*",
+        "@openscd/core": "npm:@compas-oscd/core@*",
+        "@openscd/open-scd": "npm:@compas-oscd/open-scd@*",
+        "@openscd/wizards": "npm:@compas-oscd/wizards@*",
+        "@openscd/xml": "npm:@compas-oscd/xml@*",
         "lit": "^2.2.7",
         "lit-translate": "^1.2.1",
         "marked": "^4.0.10",
@@ -35570,16 +35586,16 @@
       }
     },
     "packages/wizards": {
-      "name": "@openscd/wizards",
+      "name": "@compas-oscd/wizards",
       "version": "0.0.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@material/mwc-dialog": "0.22.1",
-        "@openscd/core": "*"
+        "@openscd/core": "npm:@compas-oscd/core@*"
       }
     },
     "packages/xml": {
-      "name": "@openscd/xml",
+      "name": "@compas-oscd/xml",
       "version": "0.0.1",
       "license": "Apache-2.0",
       "devDependencies": {
diff --git a/packages/addons/package.json b/packages/addons/package.json
index 4c9ba7f2da..a9f4f164dc 100644
--- a/packages/addons/package.json
+++ b/packages/addons/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/addons",
+  "name": "@compas-oscd/addons",
   "version": "0.34.0",
   "repository": "https://github.com/openscd/open-scd.git",
   "directory": "packages/addons",
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "lit": "^2.2.7",
-    "@openscd/core": "*"
+    "@openscd/core": "npm:@compas-oscd/core@*"
   },
   "//": {
     "clean": "rimraf build",
@@ -133,4 +133,4 @@
     ],
     "commitUrlFormat": "https://github.com/openscd/open-scd/commits/{{hash}}"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/addons/project.json b/packages/addons/project.json
index a0506d3bd5..51ef3558a5 100644
--- a/packages/addons/project.json
+++ b/packages/addons/project.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/addons",
+  "name": "@compas-oscd/addons",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "library",
   "sourceRoot": "packages/addons/src",
diff --git a/packages/core/package.json b/packages/core/package.json
index 16f992eaab..50ebb6149a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/core",
+  "name": "@compas-oscd/core",
   "version": "0.1.4",
   "description": "The core editor component of open-scd, without any extensions pre-installed.",
   "author": "Open-SCD",
diff --git a/packages/core/project.json b/packages/core/project.json
index 7ad6e57812..2d73548aa5 100644
--- a/packages/core/project.json
+++ b/packages/core/project.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/core",
+  "name": "@compas-oscd/core",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "library",
   "sourceRoot": "packages/core/src",
diff --git a/packages/distribution/package.json b/packages/distribution/package.json
index cf160d75d7..94fb61e135 100644
--- a/packages/distribution/package.json
+++ b/packages/distribution/package.json
@@ -20,8 +20,8 @@
     "./dist/**"
   ],
   "dependencies": {
-    "@openscd/addons": "*",
-    "@openscd/open-scd": "*",
+    "@compas-oscd/addons": "npm:@compas-oscd/addons@*",
+    "@compas-oscd/open-scd": "npm:@compas-oscd/open-scd@*",
     "@openscd/plugins": "*"
   },
   "scripts": {
diff --git a/packages/distribution/tsconfig.json b/packages/distribution/tsconfig.json
index e0d1130ac8..804d41691b 100644
--- a/packages/distribution/tsconfig.json
+++ b/packages/distribution/tsconfig.json
@@ -16,7 +16,12 @@
     "sourceMap": true,
     "inlineSources": true,
     "resolveJsonModule": true,
-    "rootDir": "./"
-  },
+    "paths": {
+          "@openscd/addons": ["../addons/src"],
+          "@openscd/addons/*": ["../addons/*"],
+          "@openscd/open-scd": ["../openscd/src/open-scd.ts"],
+          "@openscd/open-scd/*": ["../openscd/*"]
+        }  
+      },
   "include": ["**/*.ts"]
 }
diff --git a/packages/forms/package.json b/packages/forms/package.json
index 9cab5fd785..395cf770c8 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/forms",
+  "name": "@compas-oscd/forms",
   "version": "0.0.1",
   "description": "The forms package OpenSCD",
   "author": "Open-SCD",
diff --git a/packages/forms/project.json b/packages/forms/project.json
index 7fe5dad49d..cb3965f6a7 100644
--- a/packages/forms/project.json
+++ b/packages/forms/project.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/forms",
+  "name": "@compas-oscd/forms",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "library",
   "sourceRoot": "packages/forms/src",
diff --git a/packages/openscd/package.json b/packages/openscd/package.json
index 054ac4ab42..6e05d062b9 100644
--- a/packages/openscd/package.json
+++ b/packages/openscd/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/open-scd",
+  "name": "@compas-oscd/open-scd",
   "version": "0.34.0",
   "repository": "https://github.com/openscd/open-scd.git",
   "directory": "packages/openscd",
@@ -40,8 +40,8 @@
     "@material/mwc-textfield": "0.22.1",
     "@material/mwc-top-app-bar-fixed": "0.22.1",
     "@openscd/oscd-api": "^0.1.5",
-    "@openscd/core": "*",
-    "@openscd/xml": "*",
+    "@openscd/core": "npm:@compas-oscd/core@*",
+    "@openscd/xml": "npm:@compas-oscd/xml@*",
     "ace-custom-element": "^1.6.5",
     "lit": "^2.2.7",
     "lit-translate": "^1.2.1",
diff --git a/packages/openscd/project.json b/packages/openscd/project.json
index 172f1d02f0..590d41d1e2 100644
--- a/packages/openscd/project.json
+++ b/packages/openscd/project.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/open-scd",
+  "name": "@compas-oscd/open-scd",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "packages/openscd/src",
diff --git a/packages/openscd/tsconfig.json b/packages/openscd/tsconfig.json
index 0f6bc40452..eb1d48d0df 100644
--- a/packages/openscd/tsconfig.json
+++ b/packages/openscd/tsconfig.json
@@ -16,7 +16,12 @@
     "sourceMap": true,
     "inlineSources": true,
     "resolveJsonModule": true,
-    "rootDir": "./src"
+    "paths": {
+      "@openscd/core": ["../core/foundation.ts"],
+      "@openscd/core/*": ["../core/*"],
+      "@openscd/xml": ["../xml/src"],
+      "@openscd/xml/*": ["../xml/*"]
+    }
   },
   "include": ["./src/**/*.ts"]
 }
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index a925d00edc..a580ea6da0 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -30,10 +30,10 @@
     "@material/mwc-textarea": "0.22.1",
     "@material/mwc-textfield": "0.22.1",
     "@openenergytools/scl-lib": "^1.8.0",
-    "@openscd/core": "*",
-    "@openscd/open-scd": "*",
-    "@openscd/wizards": "*",
-    "@openscd/xml": "*",
+    "@openscd/core": "npm:@compas-oscd/core@*",
+    "@openscd/open-scd": "npm:@compas-oscd/open-scd@*",
+    "@openscd/wizards": "npm:@compas-oscd/wizards@*",
+    "@openscd/xml": "npm:@compas-oscd/xml@*",
     "lit": "^2.2.7",
     "lit-translate": "^1.2.1",
     "marked": "^4.0.10",
diff --git a/packages/plugins/tsconfig.json b/packages/plugins/tsconfig.json
index 73197f94a7..2965093c9f 100644
--- a/packages/plugins/tsconfig.json
+++ b/packages/plugins/tsconfig.json
@@ -16,7 +16,16 @@
     "sourceMap": true,
     "inlineSources": true,
     "resolveJsonModule": true,
-    "rootDir": "./src"
+    "paths": {
+      "@openscd/core": ["../core/foundation.ts"],
+      "@openscd/core/*": ["../core/*"],
+      "@openscd/open-scd": ["../openscd/src/open-scd.ts"],
+      "@openscd/open-scd/*": ["../openscd/*"],
+      "@openscd/wizards": ["../wizards/src"],
+      "@openscd/wizards/*": ["../wizards/*"],
+      "@openscd/xml": ["../xml/src"],
+      "@openscd/xml/*": ["../xml/*"]
+    }
   },
   "include": ["src/**/*.ts"]
 }
diff --git a/packages/wizards/package.json b/packages/wizards/package.json
index 86384a9261..96c875dd5c 100644
--- a/packages/wizards/package.json
+++ b/packages/wizards/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/wizards",
+  "name": "@compas-oscd/wizards",
   "version": "0.0.1",
   "repository": "https://github.com/openscd/open-scd.git",
   "directory": "packages/wizards",
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "@material/mwc-dialog": "0.22.1",
-    "@openscd/core": "*"
+    "@openscd/core": "npm:@compas-oscd/core@*"
   },
   "//": {
     "clean": "rimraf build",
diff --git a/packages/wizards/project.json b/packages/wizards/project.json
index 78dedb34f1..da580ced0b 100644
--- a/packages/wizards/project.json
+++ b/packages/wizards/project.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/wizards",
+  "name": "@compas-oscd/wizards",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "library",
   "sourceRoot": "packages/wizards/src",
diff --git a/packages/xml/package.json b/packages/xml/package.json
index 7be1ca43f0..3c5abfa3ec 100644
--- a/packages/xml/package.json
+++ b/packages/xml/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/xml",
+  "name": "@compas-oscd/xml",
   "version": "0.0.1",
   "description": "The XML manipulation package for OpenSCD",
   "author": "Open-SCD",
diff --git a/packages/xml/project.json b/packages/xml/project.json
index c7664cdcfd..f18142c2fe 100644
--- a/packages/xml/project.json
+++ b/packages/xml/project.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openscd/xml",
+  "name": "@compas-oscd/xml",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "library",
   "sourceRoot": "packages/xml/src",