diff --git a/auctions/templates/auction.html b/auctions/templates/auction.html
index 64f8ad2..35b7bf2 100755
--- a/auctions/templates/auction.html
+++ b/auctions/templates/auction.html
@@ -69,7 +69,7 @@
 
 {% if not auction.no_location %}
 <script
-src="https://maps.googleapis.com/maps/api/js?key={{google_maps_api_key}}&callback=initMap&libraries=&v=weekly"
+src="https://maps.googleapis.com/maps/api/js?key={{google_maps_api_key}}&callback=initMap&libraries=&v=weekly&libraries=marker"
 async
 ></script>
 <script>
@@ -77,7 +77,7 @@
 function initMap() {
     var map;
     var bounds = new google.maps.LatLngBounds();
-    var mapOptions = {};
+    var mapOptions = {mapId:"location_map"};
     map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions);
     var markers = [
         {% for location in pickup_locations %}
@@ -97,14 +97,14 @@
     ];
        
     var infoWindow = new google.maps.InfoWindow(), marker, i;
-    
+
     for( i = 0; i < markers.length; i++ ) {
         var position = new google.maps.LatLng(markers[i][1], markers[i][2]);
         bounds.extend(position);
-        marker = new google.maps.Marker({
+        marker = new google.maps.marker.AdvancedMarkerElement({
             position: position,
             map: map,
-            title: markers[i][0]
+            title: markers[i][0],
         });
         
         // Allow each marker to have an info window
diff --git a/auctions/templates/clubs.html b/auctions/templates/clubs.html
index 3121a1a..ca8d777 100755
--- a/auctions/templates/clubs.html
+++ b/auctions/templates/clubs.html
@@ -5,7 +5,7 @@
 
 {% block extra_js %}
 <script
-src="https://maps.googleapis.com/maps/api/js?key={{google_maps_api_key}}&callback=initMap&libraries=&v=weekly"
+src="https://maps.googleapis.com/maps/api/js?key={{google_maps_api_key}}&callback=initMap&libraries=&v=weekly&libraries=marker"
 async
 ></script>
 <script type='text/javascript'>pageView();</script>
@@ -21,7 +21,8 @@
 function initMap() {
     var map;
     var bounds = new google.maps.LatLngBounds();
-    map = new google.maps.Map(document.getElementById("map_canvas"));
+    var mapOptions = {mapId:"club_map"};
+    map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions);
     {% if has_user_location %}
     map.setZoom(8);
     map.setCenter({lat:{{ latitude }}, lng:{{ longitude }}});
@@ -51,7 +52,7 @@
     for( i = 0; i < markers.length; i++ ) {
         var position = new google.maps.LatLng(markers[i][1], markers[i][2]);
         bounds.extend(position);
-        marker = new google.maps.Marker({
+        marker = new google.maps.marker.AdvancedMarkerElement({
             position: position,
             map: map,
             title: markers[i][0]
diff --git a/auctions/templates/user_map.html b/auctions/templates/user_map.html
index 8ea8138..29843b4 100755
--- a/auctions/templates/user_map.html
+++ b/auctions/templates/user_map.html
@@ -4,7 +4,7 @@
 
 {% block extra_js %}
 <script
-src="https://maps.googleapis.com/maps/api/js?key={{google_maps_api_key}}&callback=initMap&libraries=&v=weekly"
+src="https://maps.googleapis.com/maps/api/js?key={{google_maps_api_key}}&callback=initMap&libraries=&v=weekly&libraries=marker"
 async
 ></script>
 <script type='text/javascript'>pageView();</script>
@@ -13,7 +13,8 @@
 function initMap() {
     var map;
     var bounds = new google.maps.LatLngBounds();
-    map = new google.maps.Map(document.getElementById("map_canvas"));
+    var mapOptions = {mapId:"user_map"};
+    map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions);
     map.setZoom(4);
     map.setCenter({lat:39, lng:-97});
     // Multiple Markers
@@ -38,7 +39,7 @@
     for( i = 0; i < markers.length; i++ ) {
         var position = new google.maps.LatLng(markers[i][1], markers[i][2]);
         bounds.extend(position);
-        marker = new google.maps.Marker({
+        marker = new google.maps.marker.AdvancedMarkerElement({
             position: position,
             map: map,
             title: markers[i][0]