diff --git a/backend/secfit/secfit/settings.py b/backend/secfit/secfit/settings.py
index b8c3d6d8d148122d41cb59ddbec69557c01c9544..9b4ae5a78cbe01e762ec34d71eecf343c286e5e0 100644
--- a/backend/secfit/secfit/settings.py
+++ b/backend/secfit/secfit/settings.py
@@ -43,7 +43,8 @@ ALLOWED_HOSTS = [
     "10." + groupid + ".0.4",
     "molde.idi.ntnu.no",
     "10.0.2.2",
-    "secfit-group15.herokuapp.com"
+    "secfit-group15-frontend.herokuapp.com",
+    "secfit-group15-backend.herokuapp.com"
 ]
 
 # Application definition
@@ -96,12 +97,22 @@ WSGI_APPLICATION = "secfit.wsgi.application"
 # Database
 # https://docs.djangoproject.com/en/3.1/ref/settings/#databases
 
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": BASE_DIR / "db.sqlite3",
+is_prod = os.environ.get("IS_HEROKU", None)
+
+if is_prod:
+    settings(locals())
+
+if 'DATABASE_URL' in os.environ:
+    import dj_database_url
+    print("\n\n\n\n\nHEI\n\n\n\n\n\n")
+    DATABASES = {'default': dj_database_url.config()}
+else:
+    DATABASES = {
+        "default": {
+            "ENGINE": "django.db.backends.sqlite3",
+            "NAME": BASE_DIR / "db.sqlite3",
+        }
     }
-}
 
 # CORS Policy
 CORS_ORIGIN_ALLOW_ALL = (