diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72161e042b9e80397106314a3146439db8ed4660..03b62c28ce50a9d2ffb5a6f8ebf2b1a358bddacd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 variables:
-  OPENSHIFT_SERVER: https://openshift.cern.ch
-  NAMESPACE: notifications
+  OPENSHIFT_SERVER: https://api.paas.okd.cern.ch
+  NAMESPACE: notifications-main
   RESOURCE: notifications-consumer
 
 stages:
@@ -132,7 +132,7 @@ tag_mr_prod:
       allow_failure: true
     - when: never
   environment:
-    name: prod
+    name: main
 
 import_mr_prod:
   extends: .import_image
@@ -144,7 +144,7 @@ import_mr_prod:
       allow_failure: true
     - when: never
   environment:
-    name: prod
+    name: main
 
 ######################################################
 #################### Master branch ###################
@@ -166,7 +166,7 @@ tag_image_prod:
     - if: $CI_COMMIT_BRANCH == 'master'
     - when: never
   environment:
-    name: prod
+    name: main
 
 import_image_prod:
   extends: .import_image
@@ -176,7 +176,7 @@ import_image_prod:
     - if: $CI_COMMIT_BRANCH == 'master'
     - when: never
   environment:
-    name: prod
+    name: main
 
 ######################################################
 #################### Tags ############################
@@ -198,7 +198,7 @@ tag_tagged_image:
     - if: $CI_COMMIT_TAG
     - when: never
   environment:
-    name: prod
+    name: main
 
 import_tagged_image:
   extends: .import_image
@@ -208,4 +208,4 @@ import_tagged_image:
     - if: $CI_COMMIT_TAG
     - when: never
   environment:
-    name: prod
+    name: main
diff --git a/.isort.cfg b/.isort.cfg
index 0ba42201c7302eac5be4f769721b0f91b08e6da7..25094f629aa66a17f7033c4e75bd1870dc3c882c 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -4,4 +4,4 @@ multi_line_output=3
 include_trailing_comma=True
 lines_after_imports=2
 not_skip=__init__.py
-known_third_party = Crypto,apns2,jinja2,megabus,pytest,pywebpush,requests,sqlalchemy,stomp,yaml
+known_third_party = Crypto,apns2,jinja2,megabus,pytest,pywebpush,requests,smail,sqlalchemy,stomp,yaml