diff --git a/dist/samples/web-components-map/app/index.html b/dist/samples/web-components-map/app/index.html
index 68fc50ade7..ee57691257 100644
--- a/dist/samples/web-components-map/app/index.html
+++ b/dist/samples/web-components-map/app/index.html
@@ -16,7 +16,6 @@
     <gmp-map
       center="37.4220656,-122.0840897"
       zoom="10"
-      map-id="DEMO_MAP_ID"
       style="height: 400px"
     ></gmp-map>
 
@@ -28,7 +27,7 @@
       for more information.
       -->
     <script
-      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&v=beta"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=maps&v=beta"
       defer
     ></script>
   </body>
diff --git a/dist/samples/web-components-map/docs/index.html b/dist/samples/web-components-map/docs/index.html
index 32d5d9ee33..7b637869ea 100644
--- a/dist/samples/web-components-map/docs/index.html
+++ b/dist/samples/web-components-map/docs/index.html
@@ -18,7 +18,6 @@
     <gmp-map
       center="37.4220656,-122.0840897"
       zoom="10"
-      map-id="DEMO_MAP_ID"
       style="height: 400px"
     ></gmp-map>
     <!-- [END maps_web_components_map_gmpmap] -->
@@ -31,7 +30,7 @@
       for more information.
       -->
     <script
-      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&v=beta"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=maps&v=beta"
       defer
     ></script>
   </body>
diff --git a/dist/samples/web-components-map/iframe/index.html b/dist/samples/web-components-map/iframe/index.html
index 9dc51969a9..1ccb8a0daa 100644
--- a/dist/samples/web-components-map/iframe/index.html
+++ b/dist/samples/web-components-map/iframe/index.html
@@ -15,7 +15,6 @@
     <gmp-map
       center="37.4220656,-122.0840897"
       zoom="10"
-      map-id="DEMO_MAP_ID"
       style="height: 400px"
     ></gmp-map>
 
@@ -27,7 +26,7 @@
       for more information.
       -->
     <script
-      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&v=beta"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=maps&v=beta"
       defer
     ></script>
   </body>
diff --git a/dist/samples/web-components-map/jsfiddle/demo.html b/dist/samples/web-components-map/jsfiddle/demo.html
index 69050e10a3..87467fccfb 100644
--- a/dist/samples/web-components-map/jsfiddle/demo.html
+++ b/dist/samples/web-components-map/jsfiddle/demo.html
@@ -14,7 +14,6 @@
     <gmp-map
       center="37.4220656,-122.0840897"
       zoom="10"
-      map-id="DEMO_MAP_ID"
       style="height: 400px"
     ></gmp-map>
 
@@ -26,7 +25,7 @@
       for more information.
       -->
     <script
-      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&v=beta"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=maps&v=beta"
       defer
     ></script>
   </body>
diff --git a/dist/samples/web-components-map/playground/index.html b/dist/samples/web-components-map/playground/index.html
index ba2a5eac8b..f5752c833c 100644
--- a/dist/samples/web-components-map/playground/index.html
+++ b/dist/samples/web-components-map/playground/index.html
@@ -17,7 +17,6 @@
     <gmp-map
       center="37.4220656,-122.0840897"
       zoom="10"
-      map-id="DEMO_MAP_ID"
       style="height: 400px"
     ></gmp-map>
 
@@ -29,7 +28,7 @@
       for more information.
       -->
     <script
-      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&v=beta"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=maps&v=beta"
       defer
     ></script>
   </body>
diff --git a/dist/samples/web-components-markers/app/index.html b/dist/samples/web-components-markers/app/index.html
index ec37b1ad06..c29be09c57 100644
--- a/dist/samples/web-components-markers/app/index.html
+++ b/dist/samples/web-components-markers/app/index.html
@@ -37,7 +37,7 @@
       for more information.
       -->
     <script
-      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=marker&v=beta"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=maps,marker&v=beta"
       defer
     ></script>
   </body>
diff --git a/dist/samples/web-components-markers/app/style.css b/dist/samples/web-components-markers/app/style.css
index 582e19d3dd..c97e14e569 100644
--- a/dist/samples/web-components-markers/app/style.css
+++ b/dist/samples/web-components-markers/app/style.css
@@ -21,7 +21,3 @@ body {
   padding: 0;
 }
 
-gmp-map {
-  height: 400px;
-}
-
diff --git a/dist/samples/web-components-markers/docs/index.html b/dist/samples/web-components-markers/docs/index.html
index d14d2fd83e..44a1a2193e 100644
--- a/dist/samples/web-components-markers/docs/index.html
+++ b/dist/samples/web-components-markers/docs/index.html
@@ -40,7 +40,7 @@
       for more information.
       -->
     <script
-      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=marker&v=beta"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=maps,marker&v=beta"
       defer
     ></script>
   </body>
diff --git a/dist/samples/web-components-markers/docs/style.css b/dist/samples/web-components-markers/docs/style.css
index 8a9eb1b877..99567bbdee 100644
--- a/dist/samples/web-components-markers/docs/style.css
+++ b/dist/samples/web-components-markers/docs/style.css
@@ -22,8 +22,4 @@ body {
   padding: 0;
 }
 
-gmp-map {
-  height: 400px;
-}
-
 /* [END maps_web_components_markers] */
\ No newline at end of file
diff --git a/dist/samples/web-components-markers/iframe/index.html b/dist/samples/web-components-markers/iframe/index.html
index e5cee6a3eb..902b5d7898 100644
--- a/dist/samples/web-components-markers/iframe/index.html
+++ b/dist/samples/web-components-markers/iframe/index.html
@@ -9,8 +9,8 @@
     <title>Add a Map with Markers using HTML</title>
     <script src="https://polyfill.io/v3/polyfill.min.js?features=default"></script>
 
-    <script type="module" crossorigin src="./assets/index-Rz0jDNVK.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-hqGKW_OM.css" />
+    <script type="module" crossorigin src="./assets/index-eXnYF4u5.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-sVB_vSq6.css" />
   </head>
   <body>
     <gmp-map
@@ -37,7 +37,7 @@
       for more information.
       -->
     <script
-      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=marker&v=beta"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=maps,marker&v=beta"
       defer
     ></script>
   </body>
diff --git a/dist/samples/web-components-markers/jsfiddle/demo.css b/dist/samples/web-components-markers/jsfiddle/demo.css
index 582e19d3dd..c97e14e569 100644
--- a/dist/samples/web-components-markers/jsfiddle/demo.css
+++ b/dist/samples/web-components-markers/jsfiddle/demo.css
@@ -21,7 +21,3 @@ body {
   padding: 0;
 }
 
-gmp-map {
-  height: 400px;
-}
-
diff --git a/dist/samples/web-components-markers/jsfiddle/demo.html b/dist/samples/web-components-markers/jsfiddle/demo.html
index 54441dfaf8..2fcfd531bc 100644
--- a/dist/samples/web-components-markers/jsfiddle/demo.html
+++ b/dist/samples/web-components-markers/jsfiddle/demo.html
@@ -35,7 +35,7 @@
       for more information.
       -->
     <script
-      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=marker&v=beta"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=maps,marker&v=beta"
       defer
     ></script>
   </body>
diff --git a/dist/samples/web-components-markers/playground/index.html b/dist/samples/web-components-markers/playground/index.html
index 87f8f92a71..379f2866c6 100644
--- a/dist/samples/web-components-markers/playground/index.html
+++ b/dist/samples/web-components-markers/playground/index.html
@@ -38,7 +38,7 @@
       for more information.
       -->
     <script
-      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=marker&v=beta"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB41DRUbKWJHPxaFjMAwdrzWzbVKartNGg&callback=initMap&libraries=maps,marker&v=beta"
       defer
     ></script>
   </body>
diff --git a/dist/samples/web-components-markers/playground/style.css b/dist/samples/web-components-markers/playground/style.css
index 5f1dfff74c..a8d59c808e 100644
--- a/dist/samples/web-components-markers/playground/style.css
+++ b/dist/samples/web-components-markers/playground/style.css
@@ -16,7 +16,3 @@ body {
   padding: 0;
 }
 
-gmp-map {
-  height: 400px;
-}
-