diff --git a/frontend/app/app.module.ts b/frontend/app/app.module.ts
index 2d9268f..234eb61 100644
--- a/frontend/app/app.module.ts
+++ b/frontend/app/app.module.ts
@@ -2,7 +2,7 @@ import {NgModule} from "@angular/core";
 import {BrowserModule} from "@angular/platform-browser";
 import {FormsModule} from "@angular/forms";
 import {HttpModule} from "@angular/http";
-import {AgmCoreModule} from "angular2-google-maps/core";
+import {AgmCoreModule} from "@agm/core";
 import {AppComponent} from "./app.component";
 import {appRoutes} from "./app.routing";
 import {UserService} from "./model/network/user.service";
diff --git a/frontend/app/gallery/grid/photo/photo.grid.gallery.component.html b/frontend/app/gallery/grid/photo/photo.grid.gallery.component.html
index 8627aa6..9dab905 100644
--- a/frontend/app/gallery/grid/photo/photo.grid.gallery.component.html
+++ b/frontend/app/gallery/grid/photo/photo.grid.gallery.component.html
@@ -11,22 +11,22 @@
 
         <div class="photo-position" *ngIf="gridPhoto.photo.metadata.positionData">
             <span class="glyphicon glyphicon-map-marker"></span>
-            <template [ngIf]="getPositionText()">
+            <ng-template [ngIf]="getPositionText()">
                 <a [routerLink]="['/search', getPositionText(), {type:SearchTypes[SearchTypes.position]}]"
                    *ngIf="searchEnabled">
                     {{getPositionText()}}
                 </a>
                 <span *ngIf="!searchEnabled">{{getPositionText()}}</span>
-            </template>
+            </ng-template>
         </div>
 
         <div class="photo-keywords">
-            <template ngFor let-keyword [ngForOf]="gridPhoto.photo.metadata.keywords" let-last="last">
+            <ng-template ngFor let-keyword [ngForOf]="gridPhoto.photo.metadata.keywords" let-last="last">
                 <a *ngIf="searchEnabled"
                    [routerLink]="['/search', keyword, {type: SearchTypes[SearchTypes.keyword]}]">#{{keyword}}</a>
                 <span *ngIf="!searchEnabled">#{{keyword}}</span>
-                <template [ngIf]="!last">,</template>
-            </template>
+                <ng-template [ngIf]="!last">,</ng-template>
+            </ng-template>
 
         </div>
     </div>
diff --git a/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.html b/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.html
index 5d266ce..4a654ea 100644
--- a/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.html
+++ b/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.html
@@ -7,19 +7,19 @@
          [style.top.px]="lightboxDimension.top"
          [style.left.px]="lightboxDimension.left"
          [style.opacity]="opacity">
-        <sebm-google-map
+        <agm-map
                 [style.width.px]="mapDimension.width"
                 [style.height.px]="mapDimension.height"
                 [zoom]="5"
                 [latitude]="mapCenter.latitude"
                 [longitude]="mapCenter.longitude">
-            <sebm-google-map-marker
+            <agm-marker
                     *ngFor="let photo of mapPhotos"
                     [latitude]="photo.latitude"
                     [longitude]="photo.longitude"
                     [iconUrl]="photo.iconUrl">
-            </sebm-google-map-marker>
-        </sebm-google-map>
+            </agm-marker>
+        </agm-map>
     </div>
 
 
diff --git a/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.ts b/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.ts
index da62e7a..93dc0e3 100644
--- a/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.ts
+++ b/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.ts
@@ -2,7 +2,7 @@ import {Component, ElementRef, HostListener, Input, OnChanges, ViewChild} from "
 import {PhotoDTO} from "../../../../../common/entities/PhotoDTO";
 import {Dimension} from "../../../model/IRenderable";
 import {FullScreenService} from "../../fullscreen.service";
-import {SebmGoogleMap} from "angular2-google-maps/core";
+import {AgmMap} from "@agm/core";
 import {IconThumbnail, ThumbnailManagerService} from "../../thumnailManager.service";
 import {IconPhoto} from "../../IconPhoto";
 
@@ -24,7 +24,7 @@ export class GalleryMapLightboxComponent implements OnChanges {
 
     @ViewChild("root") elementRef: ElementRef;
 
-    @ViewChild(SebmGoogleMap) map: SebmGoogleMap;
+    @ViewChild(AgmMap) map: AgmMap;
 
 
     constructor(private fullScreenService: FullScreenService, private thumbnailService: ThumbnailManagerService) {
diff --git a/frontend/app/gallery/map/map.gallery.component.html b/frontend/app/gallery/map/map.gallery.component.html
index cf134ac..f4017fe 100644
--- a/frontend/app/gallery/map/map.gallery.component.html
+++ b/frontend/app/gallery/map/map.gallery.component.html
@@ -1,6 +1,6 @@
 <gallery-map-lightbox [photos]="photos"></gallery-map-lightbox>
 <div id="map" #map>
-<sebm-google-map
+    <agm-map
         (click)="click()"
         [disableDefaultUI]="true"
         [zoomControl]="false"
@@ -10,10 +10,10 @@
         [zoom]="0"
         [latitude]="mapCenter.latitude"
         [longitude]="mapCenter.longitude">
-    <sebm-google-map-marker
+        <agm-marker
             *ngFor="let photo of mapPhotos"
             [latitude]="photo.latitude"
             [longitude]="photo.longitude">
-    </sebm-google-map-marker>
-</sebm-google-map>
+        </agm-marker>
+    </agm-map>
 </div>
\ No newline at end of file
diff --git a/frontend/systemjs.config.js b/frontend/systemjs.config.js
index c0d85c6..1cd7aff 100644
--- a/frontend/systemjs.config.js
+++ b/frontend/systemjs.config.js
@@ -25,7 +25,8 @@
 
             // other libraries
             'rxjs': 'npm:rxjs',
-            'angular2-google-maps': 'npm:angular2-google-maps',
+
+            '@agm/core': 'npm:@agm/core/core.umd.js',
             'ng2-cookies': 'npm:ng2-cookies/ng2-cookies'
         },
         // packages tells the System loader how to load when no filename and/or no extension
diff --git a/package.json b/package.json
index 3188759..bd4c5e5 100644
--- a/package.json
+++ b/package.json
@@ -21,62 +21,60 @@
     "url": "https://github.com/bpatrik/PiGallery2/issues"
   },
   "dependencies": {
-    "@angular/common": "~4.0.0",
-    "@angular/compiler": "~4.0.0",
-    "@angular/core": "~4.0.0",
-    "@angular/forms": "~4.0.0",
-    "@angular/http": "~4.0.0",
-    "@angular/platform-browser": "~4.0.0",
-    "@angular/platform-browser-dynamic": "~4.0.0",
-    "@angular/platform-server": "~4.0.0",
-    "@angular/router": "~4.0.0",
-    "angular2-google-maps": "^0.17.0",
-    "body-parser": "^1.17.1",
+    "@agm/core": "^1.0.0-beta.0",
+    "@angular/common": "~4.1.3",
+    "@angular/compiler": "~4.1.3",
+    "@angular/core": "~4.1.3",
+    "@angular/forms": "~4.1.3",
+    "@angular/http": "~4.1.3",
+    "@angular/platform-browser": "~4.1.3",
+    "@angular/platform-browser-dynamic": "~4.1.3",
+    "@angular/router": "~4.1.3",
+    "body-parser": "^1.17.2",
     "core-js": "^2.4.1",
-    "debug": "^2.6.3",
+    "debug": "^2.6.8",
     "ejs": "^2.5.6",
     "exif-parser": "^0.1.9",
-    "express": "^4.15.2",
-    "express-session": "^1.15.1",
+    "express": "^4.15.3",
+    "express-session": "^1.15.3",
     "flat-file-db": "^1.0.0",
-    "jimp": "^0.2.27",
-    "mime": "^1.3.4",
-    "mocha": "^3.2.0",
-    "morgan": "^1.8.1",
+    "jimp": "^0.2.28",
+    "mime": "^1.3.6",
+    "mocha": "^3.4.2",
+    "morgan": "^1.8.2",
     "mysql": "^2.13.0",
-    "ng2-cookies": "^1.0.8",
+    "ng2-cookies": "^1.0.12",
     "node-iptc": "^1.0.4",
     "optimist": "^0.6.1",
     "reflect-metadata": "^0.1.10",
-    "rxjs": "^5.2.0",
-    "systemjs": "0.20.10",
-    "threads": "^0.7.2",
+    "rxjs": "^5.4.0",
+    "systemjs": "0.20.12",
+    "threads": "^0.7.3",
     "typeorm": "0.0.11",
-    "zone.js": "^0.8.5"
+    "zone.js": "^0.8.11"
   },
   "devDependencies": {
     "@types/express": "^4.0.35",
-    "@types/express-session": "0.0.32",
-    "@types/jasmine": "^2.5.46",
-    "@types/node": "^7.0.11",
+    "@types/express-session": "1.15.0",
+    "@types/jasmine": "^2.5.47",
+    "@types/node": "^7.0.22",
     "@types/optimist": "0.0.29",
-    "angular-cli": "^1.0.0-beta.28.3",
-    "chai": "^3.5.0",
-    "jasmine-core": "^2.5.2",
-    "karma": "^1.5.0",
+    "chai": "^4.0.0",
+    "jasmine-core": "^2.6.2",
+    "karma": "^1.7.0",
     "karma-cli": "^1.0.1",
     "karma-jasmine": "^1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
     "karma-phantomjs-launcher": "^1.0.4",
     "karma-remap-istanbul": "^0.6.0",
     "karma-systemjs": "^0.16.0",
-    "mocha": "^3.2.0",
+    "mocha": "^3.4.2",
     "phantomjs-prebuilt": "^2.1.14",
-    "protractor": "^5.1.1",
+    "protractor": "^5.1.2",
     "remap-istanbul": "^0.9.5",
     "rimraf": "^2.6.1",
     "ts-helpers": "^1.1.2",
-    "tslint": "^4.5.1",
-    "typescript": "^2.2.1"
+    "tslint": "^5.3.2",
+    "typescript": "^2.3.3"
   }
 }