diff --git a/datashader_dashboard/datashader_dashboard.ipynb b/datashader_dashboard/datashader_dashboard.ipynb
index 8f9a6a8f3..fb8b38f6d 100644
--- a/datashader_dashboard/datashader_dashboard.ipynb
+++ b/datashader_dashboard/datashader_dashboard.ipynb
@@ -79,7 +79,7 @@
     "norms  = odict(Histogram_Equalization='eq_hist', Linear='linear', Log='log', Cube_root='cbrt')\n",
     "cmaps  = odict([(n,colorcet.palette[n]) for n in ['fire', 'bgy', 'bgyw', 'bmy', 'gray', 'kbc']])\n",
     "\n",
-    "maps   = ['EsriImagery', 'EsriUSATopo', 'EsriTerrain', 'StamenWatercolor', 'StamenTonerBackground']\n",
+    "maps   = ['EsriImagery', 'EsriUSATopo', 'EsriTerrain', 'EsriStreet', 'OSM']\n",
     "bases  = odict([(name, getattr(hvts, name)().relabel(name)) for name in maps])\n",
     "gopts  = hv.opts.Tiles(responsive=True, xaxis=None, yaxis=None, bgcolor='black', show_grid=False)\n",
     "\n",
@@ -112,7 +112,7 @@
     "\n",
     "    @pm.depends('show_labels')\n",
     "    def labels(self):\n",
-    "        return hvts.StamenLabels().options(level='annotation', alpha=1 if self.show_labels else 0)\n",
+    "        return hvts.EsriStreet().options(level='annotation', alpha=1 if self.show_labels else 0)\n",
     "\n",
     "    def viewable(self,**kwargs):\n",
     "        rasterized = rasterize(hv.DynamicMap(self.elem), aggregator=self.aggregator, width=800, height=400)\n",
@@ -226,7 +226,7 @@
     "        dataplot   = spreaded.opts(alpha=self.data_opacity, show_legend=False)\n",
     "        \n",
     "        tiles      = self.basemap.opts(gopts).opts(alpha=self.map_opacity)\n",
-    "        labels     = hvts.StamenLabels().options(level='annotation', alpha=1 if self.show_labels else 0)\n",
+    "        labels     = hvts.EsriStreet().options(level='annotation', alpha=1 if self.show_labels else 0)\n",
     "        return tiles * dataplot * labels\n",
     "    \n",
     "explorer2 = Explorer2(name=\"\")"
diff --git a/landsat/landsat.ipynb b/landsat/landsat.ipynb
index de7a97cf5..caed3b93f 100644
--- a/landsat/landsat.ipynb
+++ b/landsat/landsat.ipynb
@@ -107,7 +107,7 @@
     "    col, rows = b.shape\n",
     "    return hv.RGB((xs, ys[::-1], b, b, b, a), vdims=list('RGBA'))\n",
     "\n",
-    "tiles = hv.element.tiles.StamenToner()\n",
+    "tiles = hv.element.tiles.OSM()\n",
     "tiles * shade(rasterize(one_band(bands[1])), cmap=['black', 'white']).redim(x='Longitude', y='Latitude')"
    ]
   },
diff --git a/ml_annotators/ml_annotators.ipynb b/ml_annotators/ml_annotators.ipynb
index 91d473b5a..f201d8ba7 100644
--- a/ml_annotators/ml_annotators.ipynb
+++ b/ml_annotators/ml_annotators.ipynb
@@ -193,7 +193,7 @@
    "source": [
     "rectangles = gv.Rectangles([(0, 0, 3, 3), (12, 12, 15, 15)]).opts(fill_alpha=0.2)\n",
     "box_annotator = hv.annotate.instance()\n",
-    "labels = gv.tile_sources.StamenLabels()\n",
+    "labels = gv.tile_sources.EsriImagery()\n",
     "layout = box_annotator(rectangles, name=\"Rectangles\")\n",
     "\n",
     "hv.annotate.compose(tiles, layout, labels)"
diff --git a/ship_traffic/ship_traffic.ipynb b/ship_traffic/ship_traffic.ipynb
index ecd0a7544..02a2cc022 100644
--- a/ship_traffic/ship_traffic.ipynb
+++ b/ship_traffic/ship_traffic.ipynb
@@ -277,7 +277,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "scrolled": false
+   },
    "outputs": [],
    "source": [
     "hv.output(backend='matplotlib')\n",
@@ -341,7 +343,7 @@
     "points = hd.dynspread(hd.datashade(pts, aggregator=ds.count_cat('category'), color_key=color_key))\n",
     "\n",
     "tiles  = hv.element.tiles.ESRI().opts(alpha=0.4, bgcolor=\"black\").opts(responsive=True, min_height=600)\n",
-    "labels = hv.element.tiles.StamenLabels().opts(alpha=0.7, level='glyph')\n",
+    "labels = hv.element.tiles.EsriUSATopo().opts(alpha=0.4, level='glyph')\n",
     "\n",
     "tiles * labels * points.opts(show_legend=False) * legend.opts(xaxis='bare',yaxis='bare', title='')"
    ]
@@ -509,7 +511,7 @@
     "sopts         = dict(start=0, end=1, sizing_mode='stretch_width')\n",
     "map_opacity   = pn.widgets.FloatSlider(value=0.7, name=\"Map opacity\",   **sopts)\n",
     "data_opacity  = pn.widgets.FloatSlider(value=1.0, name=\"Data opacity\",  **sopts)\n",
-    "label_opacity = pn.widgets.FloatSlider(value=0.9, name=\"Label opacity\", **sopts)\n",
+    "label_opacity = pn.widgets.FloatSlider(value=0.3, name=\"Label opacity\", **sopts)\n",
     "overlay       = (tiles.apply.opts(alpha=map_opacity) *\n",
     "                 pointsp.apply.opts(alpha=data_opacity, show_legend=False) * vessel_name_raster *\n",
     "                 labels.apply.opts(alpha=label_opacity) * highlight * legend)\n",