diff --git a/cloud-functions-angular-start/package.json b/cloud-functions-angular-start/package.json
index 1fd0aba43..ddb1c63b8 100644
--- a/cloud-functions-angular-start/package.json
+++ b/cloud-functions-angular-start/package.json
@@ -12,41 +12,42 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^5.2.0",
-    "@angular/cdk": "^5.2.0",
-    "@angular/common": "^5.2.0",
-    "@angular/compiler": "^5.2.0",
-    "@angular/core": "^5.2.0",
-    "@angular/forms": "^5.2.0",
-    "@angular/http": "^5.2.0",
-    "@angular/material": "^5.2.0",
-    "@angular/platform-browser": "^5.2.0",
-    "@angular/platform-browser-dynamic": "^5.2.0",
-    "@angular/router": "^5.2.0",
-    "angularfire2": "^5.0.0-rc.6.0",
-    "core-js": "^2.4.1",
-    "firebase": "^6.2.4",
-    "rxjs": "^5.5.6",
-    "zone.js": "^0.8.19"
+    "@angular/animations": "6.1.10",
+    "@angular/cdk": "^6.1.10",
+    "@angular/common": "^6.1.10",
+    "@angular/compiler": "^6.1.10",
+    "@angular/core": "^6.1.10 <9",
+    "@angular/fire": "^5.2.0",
+    "@angular/forms": "^6.1.10",
+    "@angular/http": "^6.1.10",
+    "@angular/material": "^6.1.10",
+    "@angular/platform-browser": "^6.1.10",
+    "@angular/platform-browser-dynamic": "^6.1.10",
+    "@angular/router": "6.1.10",
+    "core-js": "2.4.1",
+    "firebase": "^6.3.0",
+    "rxjs": "^6.5.2",
+    "rxjs-compat": "^6.5.2",
+    "zone.js": "~0.8.26"
   },
   "devDependencies": {
-    "@angular/cli": "~1.7.4",
-    "@angular/compiler-cli": "^5.2.0",
-    "@angular/language-service": "^5.2.0",
+    "@angular/cli": "1.7.4",
+    "@angular/compiler-cli": "^6.1.10",
+    "@angular/language-service": "^6.1.10",
     "@types/jasmine": "~2.8.3",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
-    "codelyzer": "^4.0.1",
+    "codelyzer": "^5.1.0",
     "jasmine-core": "~2.8.0",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~2.0.0",
     "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "^1.2.1",
+    "karma-coverage-istanbul-reporter": "1.2.1",
     "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
+    "karma-jasmine-html-reporter": "0.2.2",
     "protractor": "~5.1.2",
     "ts-node": "~4.1.0",
     "tslint": "~5.9.1",
-    "typescript": "~2.5.3"
+    "typescript": "~2.8.0"
   }
 }
diff --git a/cloud-functions-angular-start/src/app/app.component.ts b/cloud-functions-angular-start/src/app/app.component.ts
index 2f7e4e7f5..423c506a2 100644
--- a/cloud-functions-angular-start/src/app/app.component.ts
+++ b/cloud-functions-angular-start/src/app/app.component.ts
@@ -15,8 +15,8 @@
  */
 import { Component, Inject } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
-import { AngularFireDatabase, AngularFireList } from 'angularfire2/database';
-import { AngularFireAuth } from 'angularfire2/auth';
+import { AngularFireDatabase, AngularFireList } from '@angular/fire/database';
+import { AngularFireAuth } from '@angular/fire/auth';
 import { MatSnackBar } from '@angular/material';
 import * as firebase from 'firebase';
 
diff --git a/cloud-functions-angular-start/src/app/app.module.ts b/cloud-functions-angular-start/src/app/app.module.ts
index 5cd8877d1..1ca0261a7 100644
--- a/cloud-functions-angular-start/src/app/app.module.ts
+++ b/cloud-functions-angular-start/src/app/app.module.ts
@@ -18,9 +18,9 @@ import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
-import { AngularFireModule } from 'angularfire2';
-import { AngularFireDatabaseModule } from 'angularfire2/database';
-import { AngularFireAuthModule } from 'angularfire2/auth';
+import { AngularFireModule } from '@angular/fire';
+import { AngularFireDatabaseModule } from '@angular/fire/database';
+import { AngularFireAuthModule } from '@angular/fire/auth';
 import { MatSnackBarModule } from '@angular/material';
 
 import { AppComponent } from './app.component';
diff --git a/cloud-functions-angular/src/app/app.module.ts b/cloud-functions-angular/src/app/app.module.ts
index 5cd8877d1..1ca0261a7 100644
--- a/cloud-functions-angular/src/app/app.module.ts
+++ b/cloud-functions-angular/src/app/app.module.ts
@@ -18,9 +18,9 @@ import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
-import { AngularFireModule } from 'angularfire2';
-import { AngularFireDatabaseModule } from 'angularfire2/database';
-import { AngularFireAuthModule } from 'angularfire2/auth';
+import { AngularFireModule } from '@angular/fire';
+import { AngularFireDatabaseModule } from '@angular/fire/database';
+import { AngularFireAuthModule } from '@angular/fire/auth';
 import { MatSnackBarModule } from '@angular/material';
 
 import { AppComponent } from './app.component';