diff --git a/data/imagery.json b/data/imagery.json
index a3fa1a823..99addef65 100644
--- a/data/imagery.json
+++ b/data/imagery.json
@@ -57401,13 +57401,13 @@
     "id": "mapbox_locator_overlay",
     "name": "Locator Overlay",
     "type": "tms",
-    "template": "https://api.mapbox.com/styles/v1/openstreetmap/ckasmteyi1tda1ipfis6wqhuq/tiles/256/{zoom}/{x}/{y}{@2x}?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJja2w5YWtqbDAwcGFkMnZtdngzbWtlbDE3In0.U3DODCbBGFfFXkilttz1YA",
-    "zoomExtent": [0, 16],
+    "template": "7586487389962e3f7c24b076dcc8270e6e23a5cb81e890c3fbe9928c5093fa862d8d946ea4a44f02efec19eda9f69b0bc82df4d53b740a5e284aef977eda72de707e354b5b2aa6f1afe22e7c67af90bcb2f8b411c773f6975badf128356ed1bc36fab11bb8fb221958273b22615127e25f52d3b423676a0ae92e2c9293321614e93443ce3b4fd688e8d58f0e9024a515beb7c68a31231802580a3c6517a795e413b83920f5818a6ad329d49ffb16eb7e90e2c67606ded433f813e8deae3d45fd629591f5a240e172c1663beab003ab12ce9f497037",
     "overzoom": false,
     "terms_url": "https://www.mapbox.com/about/maps",
     "terms_text": "Terms & Feedback",
     "default": true,
     "description": "Shows major features to help orient you.",
+    "encrypted": true,
     "overlay": true
   },
   {
@@ -62437,13 +62437,13 @@
     "id": "Mapbox",
     "name": "Mapbox Satellite",
     "type": "tms",
-    "template": "https://{switch:a,b,c,d}.tiles.mapbox.com/v4/mapbox.satellite/{zoom}/{x}/{y}@2x.jpg?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJjbGRiamRwa2UwMTN4M25yeHc3Yzh5bTVsIn0.9wwMW_915dmCXadG-qNj0w",
+    "template": "7586487389962e3f6627ae31c5ca3f566077e9848da9dbcda1e4978546cfa2da63928664b2f9581fe7a61bb4e7ebd518c123ff963c7007527552e2822a9c79c276626e410539abfdafed3e6d42eec7a0edbefc55dc7ffa9f55f1d524272acfab76f19a07a5ff5749722e3138703d11e15659f3b930611203f4232cb39a1e3605931b6ac51a68ac81e7c4b106b652bd479fcdd2b4132123397c7263371ea2c0f604946236f0b9af59c209d7fc901cf152f5a3957d04c08f30c042f0fa8c473eda579e",
     "tileSize": 512,
-    "zoomExtent": [0, 22],
     "terms_url": "https://www.mapbox.com/about/maps",
     "terms_text": "Terms & Feedback",
     "default": true,
     "description": "Mapbox-provided raster tileset that includes a global basemap of high resolution satellite and aerial imagery",
+    "encrypted": true,
     "icon": "https://osmlab.github.io/editor-layer-index/sources/world/MapBoxSatellite.png"
   },
   {
@@ -124456,4 +124456,4 @@
     ],
     "terms_text": "Urząd Miasta Zabrza"
   }
-]
+]
\ No newline at end of file
diff --git a/data/manual_imagery.json b/data/manual_imagery.json
index 45c48a945..f3bedd2cb 100644
--- a/data/manual_imagery.json
+++ b/data/manual_imagery.json
@@ -1,18 +1,59 @@
 [
- {
-  "id": "Maxar-Premium",
-  "name": "Maxar Premium Imagery",
-  "type": "tms",
-  "default": true,
-  "attribution": {
-   "required": true,
-   "text": "Terms & Feedback",
-   "url": "https://wiki.openstreetmap.org/wiki/DigitalGlobe"
-  },
-  "description": "Maxar Premium is a mosaic composed of Maxar basemap with select regions filled with +Vivid or custom area of interest imagery, 50cm resolution or better, and refreshed more frequently with ongoing updates.",
-  "icon": "https://osmlab.github.io/editor-layer-index/sources/world/Maxar.png",
-  "max_zoom": 22,
-  "url": "7586487389962e3f6e31ab2ed8ca321f2f3fe2cf87f1dedce8fc918b4692efd86fcd816ab8a35303effb1be9abe39b1cce3fe6db2c740044364ae68560822c88373d2c784325baf4e1fa007c6dbedab4cea3fa0dd86ee0ae4feeef032d33dcac28e4b16c90d55a42087c6b66526423ea1b4cc7e63c613940eb1c60f48270060bf41c5fcb6a628985ebe6801e9e71f015cf9dd7a76f004360017065667dc1cfe028f1332689e2d001bd06d4ebf019f829f3aac2",
-  "encrypted": true
- }
+    {
+        "id": "Maxar-Premium",
+        "name": "Maxar Premium Imagery",
+        "type": "tms",
+        "category": "photo",
+        "default": true,
+        "attribution": {
+            "required": true,
+            "text": "Terms & Feedback",
+            "url": "https://wiki.openstreetmap.org/wiki/DigitalGlobe"
+        },
+        "description": "Maxar Premium is a mosaic composed of Maxar basemap with select regions filled with +Vivid or custom area of interest imagery, 50cm resolution or better, and refreshed more frequently with ongoing updates.",
+        "icon": "https://osmlab.github.io/editor-layer-index/sources/world/Maxar.png",
+        "max_zoom": 22,
+        "url": "7586487389962e3f6e31ab2ed8ca321f2f3fe2cf87f1dedce8fc918b4692efd86fcd816ab8a35303effb1be9abe39b1cce3fe6db2c740044364ae68560822c88373d2c784325baf4e1fa007c6dbedab4cea3fa0dd86ee0ae4feeef032d33dcac28e4b16c90d55a42087c6b66526423ea1b4cc7e63c613940eb1c60f48270060bf41c5fcb6a628985ebe6801e9e71f015cf9dd7a76f004360017065667dc1cfe028f1332689e2d001bd06d4ebf019f829f3aac2",
+        "encrypted": true
+    },
+    {
+        "id": "Mapbox",
+        "name": "Mapbox Satellite",
+        "type": "tms",
+        "category": "photo",
+        "default": true,
+        "attribution": {
+            "required": true,
+            "text": "Terms & Feedback",
+            "url": "https://www.mapbox.com/about/maps"
+        },
+        "privacy_policy_url": "https://www.mapbox.com/legal/privacy/",
+        "permission_osm": "explicit",
+        "description": "Mapbox-provided raster tileset that includes a global basemap of high resolution satellite and aerial imagery",
+        "i18n": true,
+        "icon": "https://osmlab.github.io/editor-layer-index/sources/world/MapBoxSatellite.png",
+        "license_url": "https://wiki.openstreetmap.org/wiki/Vertical_Aerial_Photographs#DigitalGlobe_.2F_MapBox",
+        "max_zoom": 22,
+        "url": "7586487389962e3f6627ae31c5ca3f566077e9848da9dbcda1e4978546cfa2da63928664b2f9581fe7a61bb4e7ebd518c123ff963c7007527552e2822a9c79c276626e410539abfdafed3e6d42eec7a0edbefc55dc7ffa9f55f1d524272acfab76f19a07a5ff5749722e3138703d11e15659f3b930611203f4232cb39a1e3605931b6ac51a68ac81e7c4b106b652bd479fcdd2b4132123397c7263371ea2c0f604946236f0b9af59c209d7fc901cf152f5a3957d04c08f30c042f0fa8c473eda579e",
+        "encrypted": true
+    },
+    {
+        "id": "mapbox_locator_overlay",
+        "name": "Locator Overlay",
+        "type": "tms",
+        "category": "osmbasedmap",
+        "overlay": true,
+        "default": true,
+        "attribution": {
+            "url": "https://www.mapbox.com/about/maps",
+            "text": "Terms & Feedback",
+            "required": true
+        },
+        "privacy_policy_url": "https://www.mapbox.com/legal/privacy/",
+        "description": "Shows major features to help orient you.",
+        "i18n": true,
+        "url": "7586487389962e3f7c24b076dcc8270e6e23a5cb81e890c3fbe9928c5093fa862d8d946ea4a44f02efec19eda9f69b0bc82df4d53b740a5e284aef977eda72de707e354b5b2aa6f1afe22e7c67af90bcb2f8b411c773f6975badf128356ed1bc36fab11bb8fb221958273b22615127e25f52d3b423676a0ae92e2c9293321614e93443ce3b4fd688e8d58f0e9024a515beb7c68a31231802580a3c6517a795e413b83920f5818a6ad329d49ffb16eb7e90e2c67606ded433f813e8deae3d45fd629591f5a240e172c1663beab003ab12ce9f497037",
+        "encrypted": true,
+        "max_zoom": 16
+    }
 ]
diff --git a/scripts/update_imagery.js b/scripts/update_imagery.js
index 512c0dd2b..a77ebf88b 100644
--- a/scripts/update_imagery.js
+++ b/scripts/update_imagery.js
@@ -4,8 +4,11 @@ let sources = require('editor-layer-index/imagery.json');
 const prettyStringify = require('json-stringify-pretty-compact');
 
 if (fs.existsSync('./data/manual_imagery.json')) {
+  const manualImagery = JSON.parse(fs.readFileSync('./data/manual_imagery.json'));
   // we can include additional imagery sources that aren't in the index
-  sources = sources.concat(JSON.parse(fs.readFileSync('./data/manual_imagery.json')));
+  sources = sources
+    .filter(source => !manualImagery.find(manualSource => manualSource.id === source.id))
+    .concat(manualImagery);
 }
 
 let imagery = [];