diff --git a/.env.default b/.env.default
index 6388895132e49e617dc1efc0214935dccff436aa..951e5f203750e7b5790f1326cb221cc41165202a 100644
--- a/.env.default
+++ b/.env.default
@@ -29,3 +29,4 @@ FROM_EMAIL=$FROM_EMAIL
 AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
 AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
 AWS_BUCKET_NAME=$AWS_BUCKET_NAME
+DOMAIN=$DOMAIN
diff --git a/bloclink/apps/bis/features/environment.py b/bloclink/apps/bis/features/environment.py
index 2d2e93fcb9a404d7a3865d8026d6f7808c3890e3..fd4a12e308695f8569b85ee08a55585020c58331 100644
--- a/bloclink/apps/bis/features/environment.py
+++ b/bloclink/apps/bis/features/environment.py
@@ -1,10 +1,12 @@
+from decouple import config
+
 
 def before_all(context):
     context.endpoints = {
-        'submitBuilding': 'http://0.0.0.0:5410/buildings/bis/submit-building/',
-        'submitAnswer' : 'http://0.0.0.0:5410/buildings/bis/submit-answer/',
-        'submitContact' : 'http://0.0.0.0:5410/buildings/bis/submit-contact/',
-        'submitQuestionnaire' : 'http://0.0.0.0:5410/buildings/bis/submit-questionnaire/'
+        'submitBuilding':  'http://' + config('DOMAIN') + '/buildings/bis/submit-building/',
+        'submitAnswer' : 'http://' + config('DOMAIN') + '/buildings/bis/submit-answer/',
+        'submitContact' : 'http://' + config('DOMAIN') + '/buildings/bis/submit-contact/',
+        'submitQuestionnaire' : 'http://' + config('DOMAIN') + '/buildings/bis/submit-questionnaire/'
     }
 
 def after_all(context):