diff --git a/src/storage/observable/fromTask.ts b/src/storage/observable/fromTask.ts
index 7c66161fe..d6daef310 100644
--- a/src/storage/observable/fromTask.ts
+++ b/src/storage/observable/fromTask.ts
@@ -1,5 +1,5 @@
 import { UploadTask, UploadTaskSnapshot } from '@firebase/storage-types';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 export function fromTask(task: UploadTask) {
   return new Observable<UploadTaskSnapshot>(subscriber => {
diff --git a/src/storage/ref.ts b/src/storage/ref.ts
index 16a02df9c..98130b3a8 100644
--- a/src/storage/ref.ts
+++ b/src/storage/ref.ts
@@ -1,6 +1,6 @@
 import { SettableMetadata, UploadMetadata, Reference, StringFormat } from '@firebase/storage-types';
 import { createUploadTask, AngularFireUploadTask } from './task';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { from } from 'rxjs/observable/from';
 import { FirebaseZoneScheduler } from 'angularfire2';
 
@@ -31,9 +31,9 @@ export function createStorageRef(ref: Reference, scheduler: FirebaseZoneSchedule
         from(ref.getMetadata())
       )
     ),
-    delete: () => from(ref.delete()),
+    delete: () => Observable.from(ref.delete()),
     child: (path: string) => createStorageRef(ref.child(path), scheduler),
-    updateMetatdata: (meta: SettableMetadata) => from(ref.updateMetadata(meta)),
+    updateMetatdata: (meta: SettableMetadata) => Observable.from(ref.updateMetadata(meta)),
     put: (data: any, metadata?: UploadMetadata) => {
       const task = ref.put(data, metadata);
       return createUploadTask(task);
diff --git a/src/storage/storage.spec.ts b/src/storage/storage.spec.ts
index 10da652e9..06fb8c8a8 100644
--- a/src/storage/storage.spec.ts
+++ b/src/storage/storage.spec.ts
@@ -1,5 +1,6 @@
-import { Observable } from 'rxjs/Observable'
+import { Observable } from 'rxjs'
 import { forkJoin } from 'rxjs/observable/forkJoin';
+import { map, mergeMap, tap } from 'rxjs/operators';
 import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
 import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, StorageBucket } from 'angularfire2/storage';
@@ -90,12 +91,14 @@ describe('AngularFireStorage', () => {
       const task = ref.put(blob);
       // Wait for the upload
       const sub = forkJoin(task.snapshotChanges())
-        // get the url download
-        .mergeMap(() => ref.getDownloadURL())
-        // assert the URL
-        .do(url => expect(url).toBeDefined())
-        // Delete the file
-        .mergeMap(url => ref.delete())
+        .pipe(
+          // get the url download
+          mergeMap(() => ref.getDownloadURL()),
+          // assert the URL
+          tap(url => expect(url).toBeDefined()),
+          // Delete the file
+          mergeMap(url => ref.delete())
+        )
         // finish the test
         .subscribe(done, done.fail);
     });
@@ -107,12 +110,14 @@ describe('AngularFireStorage', () => {
       const task = ref.put(blob, { customMetadata: { blah: 'blah' } });
       // Wait for the upload
       const sub = forkJoin(task.snapshotChanges())
-        // get the metadata download
-        .mergeMap(() => ref.getMetadata())
-        // assert the URL
-        .do(meta => expect(meta.customMetadata).toEqual({ blah: 'blah' }))
-        // Delete the file
-        .mergeMap(meta => ref.delete())
+        .pipe(
+          // get the metadata download
+          mergeMap(() => ref.getMetadata()),
+          // assert the URL
+          tap(meta => expect(meta.customMetadata).toEqual({ blah: 'blah' })),
+          // Delete the file
+          mergeMap(meta => ref.delete())
+        )
         // finish the test
         .subscribe(done, done.fail);
     });
@@ -180,12 +185,14 @@ describe('AngularFireStorage w/options', () => {
       const task = ref.put(blob);
       // Wait for the upload
       const sub = forkJoin(task.snapshotChanges())
-        // get the url download
-        .mergeMap(() => ref.getDownloadURL())
-        // assert the URL
-        .do(url => expect(url).toMatch(new RegExp(`https:\\/\\/firebasestorage\\.googleapis\\.com\\/v0\\/b\\/${FIREBASE_STORAGE_BUCKET}\\/o\\/af\\.json`)))
-        // Delete the file
-        .mergeMap(url => ref.delete())
+        .pipe(
+          // get the url download
+          mergeMap(() => ref.getDownloadURL()),
+          // assert the URL
+          tap(url => expect(url).toMatch(new RegExp(`https:\\/\\/firebasestorage\\.googleapis\\.com\\/v0\\/b\\/${FIREBASE_STORAGE_BUCKET}\\/o\\/af\\.json`))),
+          // Delete the file
+          mergeMap(url => ref.delete())
+        )
         // finish the test
         .subscribe(done, done.fail);
     });
diff --git a/src/storage/storage.ts b/src/storage/storage.ts
index 8b63e166a..5ef92c9de 100644
--- a/src/storage/storage.ts
+++ b/src/storage/storage.ts
@@ -2,7 +2,7 @@ import { Injectable, Inject, Optional, InjectionToken, NgZone, PLATFORM_ID } fro
 import { FirebaseStorage, UploadMetadata } from '@firebase/storage-types';
 import { createStorageRef, AngularFireStorageReference } from './ref';
 import { createUploadTask, AngularFireUploadTask } from './task';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { FirebaseAppConfig, FirebaseAppName, FirebaseZoneScheduler, _firebaseAppFactory } from 'angularfire2';
 import { FirebaseOptions } from '@firebase/app-types';
 
diff --git a/src/storage/task.ts b/src/storage/task.ts
index 766255e40..194758efd 100644
--- a/src/storage/task.ts
+++ b/src/storage/task.ts
@@ -1,6 +1,6 @@
 import { UploadTaskSnapshot, UploadTask } from '@firebase/storage-types';
 import { fromTask } from './observable/fromTask';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { map, filter } from 'rxjs/operators';
 import { from } from 'rxjs/observable/from';