diff --git a/packages/cli/package.json b/packages/cli/package.json
index 44580c51092215a1f46be6eed077c1071a3be923..5761156b7d311238938e81a9060738523b6a384c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -35,7 +35,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet-cli"
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet"
   },
   "devDependencies": {
     "@pubsweet/starter":
diff --git a/packages/client/package.json b/packages/client/package.json
index f25c3fc5acd361cda20e5e26452ba1e5055d13d4..d1fcf3e51a63a1fcd459cc2c9ea914912fe0e195 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -52,7 +52,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet-client"
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet"
   },
   "jest": {
     "testRegex": "/test/.+test.jsx?$",
diff --git a/packages/components/packages/Blog/package.json b/packages/components/packages/Blog/package.json
index 4e49bba269274dc681d1d0a31869d8f9c0a8a8e7..b7abc8c9c82bae0842f7eda873d1811028488d93 100644
--- a/packages/components/packages/Blog/package.json
+++ b/packages/components/packages/Blog/package.json
@@ -20,7 +20,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "Blog"
   }
 }
diff --git a/packages/components/packages/Draft.js/package.json b/packages/components/packages/Draft.js/package.json
index 17ed7b886cac0d477d2d02e61e744e3695f5c1a7..040d4319286f437fec2bad67240121b4d09f0d13 100644
--- a/packages/components/packages/Draft.js/package.json
+++ b/packages/components/packages/Draft.js/package.json
@@ -17,7 +17,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "Draft.js"
   }
 }
diff --git a/packages/components/packages/FormGroup/package.json b/packages/components/packages/FormGroup/package.json
index 52f92dfac5bd548837d08c6688a02ae7ea428136..c0d9487103ec253117f6419c92cf6989c1bdd887 100644
--- a/packages/components/packages/FormGroup/package.json
+++ b/packages/components/packages/FormGroup/package.json
@@ -1,7 +1,8 @@
 {
   "name": "pubsweet-component-form-group",
   "version": "0.1.2",
-  "description": "Form component based on react-bootstrap with validation support for PubSweet",
+  "description":
+    "Form component based on react-bootstrap with validation support for PubSweet",
   "main": "index.js",
   "author": "Collaborative Knowledge Foundation",
   "license": "MIT",
@@ -17,7 +18,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "FormGroup"
   }
 }
diff --git a/packages/components/packages/HTML/package.json b/packages/components/packages/HTML/package.json
index 0706f4d623e595a69a2b47ba97102e7431f9c1fb..8730ab7c65614cef2d13e4c5fa3e6e56bc5b261c 100644
--- a/packages/components/packages/HTML/package.json
+++ b/packages/components/packages/HTML/package.json
@@ -16,7 +16,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "HTML"
   }
 }
diff --git a/packages/components/packages/InkFrontend/package.json b/packages/components/packages/InkFrontend/package.json
index c02285d717fd0582c5501aff92aed8ada0cfe2da..f30f21e3297013ba11c085492625e20db864883e 100644
--- a/packages/components/packages/InkFrontend/package.json
+++ b/packages/components/packages/InkFrontend/package.json
@@ -1,11 +1,12 @@
 {
   "name": "pubsweet-component-ink-frontend",
   "version": "0.2.2",
-  "description": "A frontend component that talks to the INK backend component (which talks to INK for file processing and conversion)",
+  "description":
+    "A frontend component that talks to the INK backend component (which talks to INK for file processing and conversion)",
   "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet-components"
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet"
   },
   "keywords": [
     "file",
diff --git a/packages/components/packages/Login/package.json b/packages/components/packages/Login/package.json
index 0a367582a1facbe623d848d73d94f06ff5741019..151bd9166210e4c19e340a1b5dc004d4d01f9d65 100644
--- a/packages/components/packages/Login/package.json
+++ b/packages/components/packages/Login/package.json
@@ -19,7 +19,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "Login"
   }
 }
diff --git a/packages/components/packages/Manage/package.json b/packages/components/packages/Manage/package.json
index 41b4c221faeebb537da83a463ac971f1f6d9bc85..cdb840de5314b624fe97bcb1a39298accbcb347b 100644
--- a/packages/components/packages/Manage/package.json
+++ b/packages/components/packages/Manage/package.json
@@ -16,7 +16,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "Manage"
   }
 }
diff --git a/packages/components/packages/MediumDraft/package.json b/packages/components/packages/MediumDraft/package.json
index 90f3bfdc5205a12a4ca3f23ab9b45df1f1e55863..8f94ebbe7f8592e00170d9b59e19ba0949fbefd7 100644
--- a/packages/components/packages/MediumDraft/package.json
+++ b/packages/components/packages/MediumDraft/package.json
@@ -19,7 +19,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "MediumDraft"
   }
 }
diff --git a/packages/components/packages/Navigation/package.json b/packages/components/packages/Navigation/package.json
index 157e4c1eec6a97c6c4279bdcb19ae7696a23b0cf..0e5c0d2fecb07b82e9c3312b4c420899c0c87c35 100644
--- a/packages/components/packages/Navigation/package.json
+++ b/packages/components/packages/Navigation/package.json
@@ -17,7 +17,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "Navigation"
   }
 }
diff --git a/packages/components/packages/PasswordResetBackend/package.json b/packages/components/packages/PasswordResetBackend/package.json
index bda43cfc8fa303323efc383d37cc9967bf977567..5451a5c47a06ba97c8b1fe08116658b555e4930a 100644
--- a/packages/components/packages/PasswordResetBackend/package.json
+++ b/packages/components/packages/PasswordResetBackend/package.json
@@ -20,7 +20,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "PasswordResetBackend"
   }
 }
diff --git a/packages/components/packages/PasswordResetFrontend/package.json b/packages/components/packages/PasswordResetFrontend/package.json
index 93c98b0c5b1464092be931649620f95c4a7b2ea6..3cfbf4e131ea527077ece48b44461763a38189fe 100644
--- a/packages/components/packages/PasswordResetFrontend/package.json
+++ b/packages/components/packages/PasswordResetFrontend/package.json
@@ -17,7 +17,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "PasswordResetFrontend"
   }
 }
diff --git a/packages/components/packages/PepperTheme/package.json b/packages/components/packages/PepperTheme/package.json
index e6063e569cbaca6afc0118cfcaba60020e802053..920f26439681f92413b1891c7873b7c8c7248e52 100644
--- a/packages/components/packages/PepperTheme/package.json
+++ b/packages/components/packages/PepperTheme/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "PepperTheme"
   }
 }
diff --git a/packages/components/packages/PostsManager/package.json b/packages/components/packages/PostsManager/package.json
index 23e0a993b61535237ec4ac3648c4206a62062cc7..f86f5a952cb9af243e9a7e8e3651b836a3a1e65e 100644
--- a/packages/components/packages/PostsManager/package.json
+++ b/packages/components/packages/PostsManager/package.json
@@ -22,7 +22,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "PostsManager"
   }
 }
diff --git a/packages/components/packages/Signup/package.json b/packages/components/packages/Signup/package.json
index 73808c9866dda016ef7f5478911221a4fde66eae..77569876a7de3403f9d44f10cbd66c22735de44b 100644
--- a/packages/components/packages/Signup/package.json
+++ b/packages/components/packages/Signup/package.json
@@ -18,7 +18,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "Signup"
   }
 }
diff --git a/packages/components/packages/TeamsManager/package.json b/packages/components/packages/TeamsManager/package.json
index 507340f45a414377c5a7d6824c8cf438cfae9abe..a7fef779daad22c5b5d2da71ff40eb07ea5c01bb 100644
--- a/packages/components/packages/TeamsManager/package.json
+++ b/packages/components/packages/TeamsManager/package.json
@@ -19,7 +19,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "TeamsManager"
   }
 }
diff --git a/packages/components/packages/UsersManager/package.json b/packages/components/packages/UsersManager/package.json
index b14bbdfddd0bb971b4f5c35792e2d23378a85a6c..e5f154798aac3cf3c8e6b49c0fb6f79d927842cc 100644
--- a/packages/components/packages/UsersManager/package.json
+++ b/packages/components/packages/UsersManager/package.json
@@ -17,7 +17,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://gitlab.coko.foundation/pubsweet-components.git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet",
     "path": "UsersManager"
   }
 }
diff --git a/packages/db-manager/package.json b/packages/db-manager/package.json
index 63318b09acf61043a15ea805c52d0747fbb0bb4c..9edbe14e7e062652f8319f81279fe91c144dc20f 100644
--- a/packages/db-manager/package.json
+++ b/packages/db-manager/package.json
@@ -11,7 +11,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@gitlab.coko.foundation:yld/db-manager.git"
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet"
   },
   "keywords": ["pubsweet", "database"],
   "engines": {
diff --git a/packages/logger/package.json b/packages/logger/package.json
index 101b2f84ca026df9881c38ecda9958c128eeeb83..872e78d22e24b589051c60c5c0edbe9cbcf4821c 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -10,7 +10,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@gitlab.coko.foundation:pubsweet/pubsweet-logger.git"
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet"
   },
   "keywords": ["logger", "pubsweet"],
   "engines": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 09ecde0289ed8ab99dd5dbb1327f5aed7a62320a..d37f4c9e3d1e21d76d7884a46843a13d52be75ed 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -57,7 +57,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet-server"
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet"
   },
   "jest": {
     "verbose": true,
diff --git a/packages/theme-plugin/package.json b/packages/theme-plugin/package.json
index 3eacaf77c7c9b4d335464170124ccb0414ac7ad2..abb5744298af7816ed2b454f13aad387b4f6633f 100644
--- a/packages/theme-plugin/package.json
+++ b/packages/theme-plugin/package.json
@@ -5,13 +5,9 @@
   "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet-theme-plugin"
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet"
   },
-  "keywords": [
-    "themes",
-    "webpack",
-    "plugin"
-  ],
+  "keywords": ["themes", "webpack", "plugin"],
   "author": "Collaborative Knowledge Foundation",
   "license": "MIT"
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
index c88fb6264ce298122a6863c6073aa3c1f1e910f0..42d90fdcf4af0ec3c40b47a18d8ea5dc6b1493d2 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@pubsweet/ui",
   "version": "0.1.0",
-  "files": [
-    "docs",
-    "dist",
-    "src"
-  ],
+  "files": ["docs", "dist", "src"],
   "main": "src",
   "jsnext:main": "src",
+  "repository": {
+    "type": "git",
+    "url": "https://gitlab.coko.foundation/pubsweet/pubsweet"
+  },
   "dependencies": {
     "babel-jest": "^21.2.0",
     "classnames": "^2.2.5",