diff --git a/.circleci/config.yml b/.circleci/config.yml
index aa211ce..06963a3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -66,7 +66,7 @@ jobs:
             
       - run:
           name: Smoke test
-          command: HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" curl -s -o /dev/null -w "%{http_code}" https://whispering-forest-11533.herokuapp.com/api/articles`
+          command: HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://$HEROKU_APP_NAME.herokuapp.com/api/articles`
       - run:
           name: Smoke test check
           command:  if [[ "$HTTPCODE" -ne 200 ]];then
diff --git a/conduit/settings.py b/conduit/settings.py
index b838a6d..4bca0cf 100644
--- a/conduit/settings.py
+++ b/conduit/settings.py
@@ -25,6 +25,10 @@ class Config(object):
         'http://localhost:4200',
         'http://0.0.0.0:4000',
         'http://localhost:4000',
+        'http://0.0.0.0:' + os.environ.get('PORT', '8080'),
+        'https://0.0.0.0:' + os.environ.get('PORT', '8080'),
+        'https://tp-devops-final.netlify.app',
+        os.environ.get('FRONT_PROD_URL', ''),
     ]
     JWT_HEADER_TYPE = 'Token'