diff --git a/src/app/rxjs-extensions.ts b/src/app/rxjs-extensions.ts
index ca710e4..6d87bb4 100644
--- a/src/app/rxjs-extensions.ts
+++ b/src/app/rxjs-extensions.ts
@@ -4,9 +4,9 @@ import 'rxjs/add/observable/throw';
 
 // Observable operators
 import 'rxjs/add/operator/catch';
-import 'rxjs/add/operator/debounceTime';
-import 'rxjs/add/operator/distinctUntilChanged';
+import 'rxjs/operators/debounceTime';
+import 'rxjs/operators/distinctUntilChanged';
 import 'rxjs/add/operator/do';
-import 'rxjs/add/operator/filter';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/switchMap';
+import 'rxjs/operators/filter';
+import 'rxjs/operators/map';
+import 'rxjs/operators/switchMap';
diff --git a/src/app/stack/feedback/feedback.service.ts b/src/app/stack/feedback/feedback.service.ts
index 27b54d8..9b53414 100644
--- a/src/app/stack/feedback/feedback.service.ts
+++ b/src/app/stack/feedback/feedback.service.ts
@@ -3,7 +3,7 @@ import { Http, Response, Headers, RequestOptions  } from '@angular/http';
 import { AuthenticationService } from 'ngx-login-client';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/catch';
-import 'rxjs/add/operator/map';
+import 'rxjs/operators/map';
 
 @Injectable()
 export class FeedbackService {
diff --git a/src/app/stack/stack-analyses.service.ts b/src/app/stack/stack-analyses.service.ts
index c2d585f..508f5a1 100644
--- a/src/app/stack/stack-analyses.service.ts
+++ b/src/app/stack/stack-analyses.service.ts
@@ -3,7 +3,7 @@ import { Http, Response, Headers, RequestOptions  } from '@angular/http';
 import { AuthenticationService } from 'ngx-login-client';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/catch';
-import 'rxjs/add/operator/map';
+import 'rxjs/operators/map';
 
 import { WIT_API_URL } from 'ngx-fabric8-wit';
 
diff --git a/src/app/stack/stack-details/add-work-flow.service.ts b/src/app/stack/stack-details/add-work-flow.service.ts
index bb42cba..0a9355c 100644
--- a/src/app/stack/stack-details/add-work-flow.service.ts
+++ b/src/app/stack/stack-details/add-work-flow.service.ts
@@ -4,7 +4,7 @@ import { AuthenticationService } from 'ngx-login-client';
 import { WIT_API_URL, Contexts } from 'ngx-fabric8-wit';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/catch';
-import 'rxjs/add/operator/map';
+import 'rxjs/operators/map';
 
 @Injectable()
 export class AddWorkFlowService {