diff --git a/packages/building-webpack/package.json b/packages/building-webpack/package.json
index d8cc384e..3a736076 100644
--- a/packages/building-webpack/package.json
+++ b/packages/building-webpack/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/building-webpack",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/building-webpack"
+  },
   "scripts": {
     "start": "webpack-dev-server --mode development --config demo/webpack.config.js --open",
     "start:es5": "webpack-dev-server --mode development --config demo/webpack.config.js --es5 --open",
diff --git a/packages/chai-dom-equals/package.json b/packages/chai-dom-equals/package.json
index f2bf8a86..b0ee30ab 100644
--- a/packages/chai-dom-equals/package.json
+++ b/packages/chai-dom-equals/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/chai-dom-equals",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/chai-dom-equals"
+  },
   "scripts": {
     "test": "karma start",
     "test:watch": "karma start --auto-watch=true --single-run=false",
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
index 9bcaf17b..d442c8b9 100644
--- a/packages/eslint-config/package.json
+++ b/packages/eslint-config/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/eslint-config",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/eslint-config"
+  },
   "main": "index.js",
   "scripts": {
     "prepublishOnly": "../../scripts/insert-header.js"
diff --git a/packages/generator-open-wc/package.json b/packages/generator-open-wc/package.json
index ec87d39c..b3baaed3 100644
--- a/packages/generator-open-wc/package.json
+++ b/packages/generator-open-wc/package.json
@@ -5,7 +5,11 @@
   "author": "open-wc",
   "homepage": "https://github.com/open-wc/open-wc/",
   "license": "MIT",
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/generator-open-wc",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/generator-open-wc"
+  },
   "keywords": [
     "yeoman-generator",
     "open-wc"
diff --git a/packages/owc-dev-server/package.json b/packages/owc-dev-server/package.json
index b1f9488f..f4b25aa4 100644
--- a/packages/owc-dev-server/package.json
+++ b/packages/owc-dev-server/package.json
@@ -16,7 +16,11 @@
     "start": "./owc-dev-server.js -o demo --app-index demo/index.html",
     "prepublishOnly": "../../scripts/insert-header.js"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/dev-server",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/dev-server"
+  },
   "dependencies": {
     "command-line-args": "^5.0.2",
     "command-line-usage": "^5.0.5",
diff --git a/packages/polyfills-loader/package.json b/packages/polyfills-loader/package.json
index 1faa70ba..88edd282 100644
--- a/packages/polyfills-loader/package.json
+++ b/packages/polyfills-loader/package.json
@@ -9,7 +9,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/polyfills-loader",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/polyfills-loader"
+  },
   "keywords": [
     "open-wc",
     "polyfill",
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index 3ac74e35..8a6f1e79 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/prettier-config",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/prettier-config"
+  },
   "main": "prettier.config.js",
   "scripts": {
     "prepublishOnly": "../../scripts/insert-header.js"
diff --git a/packages/semantic-dom-diff/package.json b/packages/semantic-dom-diff/package.json
index ea93fca2..54a35bdf 100644
--- a/packages/semantic-dom-diff/package.json
+++ b/packages/semantic-dom-diff/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/semantic-dom-diff",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/semantic-dom-diff"
+  },
   "scripts": {
     "test": "karma start",
     "test:es5:bs": "karma start karma.es5.bs.config.js",
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index e67aa2d8..b96f6f9b 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/storybook",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/storybook"
+  },
   "scripts": {
     "prepublishOnly": "../../scripts/insert-header.js"
   },
diff --git a/packages/testing-helpers/package.json b/packages/testing-helpers/package.json
index 79711bc2..9870a6a5 100644
--- a/packages/testing-helpers/package.json
+++ b/packages/testing-helpers/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/testing-helpers",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/testing-helpers"
+  },
   "scripts": {
     "test": "karma start",
     "test:watch": "karma start --auto-watch=true --single-run=false",
diff --git a/packages/testing-karma-bs/package.json b/packages/testing-karma-bs/package.json
index 81cfba2d..dc202373 100644
--- a/packages/testing-karma-bs/package.json
+++ b/packages/testing-karma-bs/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/testing-karma-bs",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/testing-karma-bs"
+  },
   "scripts": {
     "test": "karma start demo/karma.conf.js",
     "test:watch": "karma start demo/karma.conf.js --auto-watch=true --single-run=false",
diff --git a/packages/testing-karma/package.json b/packages/testing-karma/package.json
index 72d483f7..8c215680 100644
--- a/packages/testing-karma/package.json
+++ b/packages/testing-karma/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/testing-karma",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/testing-karma"
+  },
   "scripts": {
     "test": "karma start demo/karma.conf.js",
     "test:watch": "karma start demo/karma.conf.js --auto-watch=true --single-run=false",
diff --git a/packages/testing-wallaby/package.json b/packages/testing-wallaby/package.json
index 1baf5d6b..bcf099a6 100644
--- a/packages/testing-wallaby/package.json
+++ b/packages/testing-wallaby/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/testing-wallaby",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/testing-wallaby"
+  },
   "scripts": {
     "prepublishOnly": "../../scripts/insert-header.js"
   },
diff --git a/packages/testing/package.json b/packages/testing/package.json
index 25b2ff9f..2ccbab34 100644
--- a/packages/testing/package.json
+++ b/packages/testing/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/testing",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/testing"
+  },
   "scripts": {
     "test": "karma start",
     "test:watch": "karma start --auto-watch=true --single-run=false",
diff --git a/packages/webpack-import-meta-loader/package.json b/packages/webpack-import-meta-loader/package.json
index 95c60e34..7fe43f48 100644
--- a/packages/webpack-import-meta-loader/package.json
+++ b/packages/webpack-import-meta-loader/package.json
@@ -9,7 +9,11 @@
     "access": "public"
   },
   "main": "webpack-import-meta-loader.js",
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/webpack-import-meta-loader",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/webpack-import-meta-loader"
+  },
   "scripts": {
     "test": "mocha --require @babel/register",
     "test:ci": "npm run test",
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index f11e5281..9d7fd87c 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -8,7 +8,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "https://github.com/open-wc/open-wc/tree/master/packages/webpack",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/open-wc/open-wc.git",
+    "directory": "packages/webpack"
+  },
   "scripts": {
     "test": "mocha --require @babel/register",
     "test:ci": "npm run test",