diff --git a/Layout/default/Building/Form.php b/Layout/default/Building/Form.php
index facae7ed2..68d14444e 100644
--- a/Layout/default/Building/Form.php
+++ b/Layout/default/Building/Form.php
@@ -160,7 +160,7 @@
                     <div class="col-lg-2">
                     </div>
                     <div class="col-lg-10">
-                      <a href="https://www.google.com/maps/search/?api=1&query=<?=$building->gps_lat?>,<?=$building->gps_long?>" target="_blank"><i class="fas fa-external-link-alt"></i> Auf Google Maps öffnen</a>
+                      <a href="https://maps.google.com/maps?t=k&q=loc:<?=$building->gps_lat?>+<?=$building->gps_long?>" target="_blank"><i class="fas fa-external-link-alt"></i> Auf Google Maps öffnen</a>
                     </div>
                   </div>
 
diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php
index d697e5109..ec626ed16 100644
--- a/Layout/default/Linework/Index.php
+++ b/Layout/default/Linework/Index.php
@@ -150,7 +150,7 @@
                     <td>
                       <div>
                         <?php if($term->building->gps_lat && $term->building->gps_long): ?>
-                          <a href="https://www.google.com/maps/search/?api=1&query=<?=$term->building->gps_lat?>,<?=$term->building->gps_long?>" target="_blank">
+                          <a href="https://maps.google.com/maps?t=k&q=loc:<?=$term->building->gps_lat?>+<?=$term->building->gps_long?>" target="_blank">
                             <i class='fas fa-globe-europe'></i> <strong style="white-space: nowrap;"><?=$term->building->street?></strong>
                           </a>
                         <?php else: ?>
@@ -183,7 +183,7 @@
                         <tr>
                           <th>AP-Typ</th>
                           <th>AP-Name</th>
-                          <th>GPS</th>
+                          <th>AP-Koordinaten</th>
                           <th>Rohrverband</th>
                           <th>Rohrtyp</th>
                           <th>Rohrfarbe</th>
@@ -191,7 +191,7 @@
                         <tr>
                           <td><?=$term->building->workflowitems['anschlusspunkt_typ']->value->value_string?></td>
                           <td><?=$term->building->workflowitems['anschlusspunkt_name']->value->value_string?></td>
-                          <td><?=($term->building->workflowitems['anschlusspunkt_gps']->value->value_string) ? "<a href='https://www.google.com/maps/search/?api=1&query=".join(",", $term->building->workflowitems['anschlusspunkt_gps']->value->gps)."' target='_blank'><i class='fas fa-external-link-alt'></i> ".join(", ", $term->building->workflowitems['anschlusspunkt_gps']->value->gps)."</a>" : ""?></td>
+                          <td><?=($term->building->workflowitems['anschlusspunkt_gps']->value->value_string) ? "<a href='https://maps.google.com/maps?t=k&q=loc:".join("+", $term->building->workflowitems['anschlusspunkt_gps']->value->gps)."' target='_blank'><i class='fas fa-external-link-alt'></i> ".join(", ", $term->building->workflowitems['anschlusspunkt_gps']->value->gps)."</a>" : ""?></td>
                           <td><?=$term->building->workflowitems['rohrverband_name']->value->value_string?></td>
                           <td><?=$term->building->workflowitems['rohrtype']->value->value_string?></td>
                           <td>