diff --git a/modules/services/nsi.js b/modules/services/nsi.js
index 6a135ac70..b198549cb 100644
--- a/modules/services/nsi.js
+++ b/modules/services/nsi.js
@@ -41,13 +41,13 @@ function escapeRegex(s) {
 //
 function setNsiSources() {
   const sources = {
-    'nsi_data': 'https://raw.githubusercontent.com/osmlab/name-suggestion-index/main/dist/nsi.min.json',
-    'nsi_dissolved': 'https://raw.githubusercontent.com/osmlab/name-suggestion-index/main/dist/dissolved.min.json',
-    'nsi_features': 'https://raw.githubusercontent.com/osmlab/name-suggestion-index/main/dist/featureCollection.min.json',
-    'nsi_generics': 'https://raw.githubusercontent.com/osmlab/name-suggestion-index/main/dist/genericWords.min.json',
-    'nsi_presets': 'https://raw.githubusercontent.com/osmlab/name-suggestion-index/main/dist/presets/nsi-id-presets.min.json',
-    'nsi_replacements': 'https://raw.githubusercontent.com/osmlab/name-suggestion-index/main/dist/replacements.min.json',
-    'nsi_trees': 'https://raw.githubusercontent.com/osmlab/name-suggestion-index/main/dist/trees.min.json'
+    'nsi_data': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@5.0/dist/nsi.min.json',
+    'nsi_dissolved': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@5.0/dist/dissolved.min.json',
+    'nsi_features': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@5.0/dist/featureCollection.min.json',
+    'nsi_generics': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@5.0/dist/genericWords.min.json',
+    'nsi_presets': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@5.0/dist/presets/nsi-id-presets.min.json',
+    'nsi_replacements': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@5.0/dist/replacements.min.json',
+    'nsi_trees': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@5.0/dist/trees.min.json'
   };
 
   let fileMap = fileFetcher.fileMap();
diff --git a/package.json b/package.json
index a7df71c9b..594aa92e7 100644
--- a/package.json
+++ b/package.json
@@ -95,12 +95,12 @@
     "happen": "^0.3.1",
     "js-yaml": "^4.0.0",
     "json-stringify-pretty-compact": "^2.0.0",
-    "mapillary-js": "~3.0.0",
     "mapillary_sprite_source": "^1.8.0",
+    "mapillary-js": "~3.0.0",
     "minimist": "^1.2.3",
     "mocha": "^7.0.1",
     "mocha-phantomjs-core": "^2.1.0",
-    "name-suggestion-index": "^5.0.0-pre",
+    "name-suggestion-index": "~5.0",
     "node-fetch": "^2.6.1",
     "npm-run-all": "^4.0.0",
     "object-inspect": "1.9.0",