diff --git a/solution/pulse/countries/migrations/0001_initial.py b/solution/pulse/countries/migrations/0001_initial.py
index dea5fca..6806bd3 100644
--- a/solution/pulse/countries/migrations/0001_initial.py
+++ b/solution/pulse/countries/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-02-27 18:38
+# Generated by Django 4.2.10 on 2024-02-28 12:32
 
 from django.db import migrations, models
 
@@ -20,5 +20,8 @@ class Migration(migrations.Migration):
                 ('alpha3', models.CharField(max_length=3)),
                 ('region', models.CharField()),
             ],
+            options={
+                'db_table': 'countries',
+            },
         ),
     ]
diff --git a/solution/pulse/countries/models.py b/solution/pulse/countries/models.py
index b288235..fe3a860 100644
--- a/solution/pulse/countries/models.py
+++ b/solution/pulse/countries/models.py
@@ -7,5 +7,8 @@ class Country(models.Model):
     alpha3 = models.CharField(max_length=3)
     region = models.CharField()
 
+    class Meta:
+        db_table = "countries"
+
     def __str__(self):
         return self.name
diff --git a/solution/pulse/pulse/settings.py b/solution/pulse/pulse/settings.py
index f1b8a02..1c81641 100644
--- a/solution/pulse/pulse/settings.py
+++ b/solution/pulse/pulse/settings.py
@@ -1,7 +1,6 @@
 import os
 from pathlib import Path
 
-import dj_database_url
 from dotenv import load_dotenv
 
 load_dotenv()
@@ -61,28 +60,16 @@ TEMPLATES = [
 
 WSGI_APPLICATION = "pulse.wsgi.application"
 
-POSTGRES_CONN = os.getenv("POSTGRES_CONN")
-
-POSTGRES_JDBC_URL = os.getenv("POSTGRES_JDBC_URL")
-
-if POSTGRES_CONN:
-    DATABASES = {
-        "default": {
-            "ENGINE": "django.db.backends.postgresql",
-            **dj_database_url.parse(POSTGRES_CONN),
-        },
-    }
-else:
-    DATABASES = {
-        "default": {
-            "ENGINE": "django.db.backends.postgresql",
-            "NAME": os.getenv("POSTGRES_DATABASE"),
-            "USER": os.getenv("POSTGRES_USERNAME"),
-            "PASSWORD": os.getenv("POSTGRES_PASSWORD"),
-            "HOST": os.getenv("POSTGRES_HOST"),
-            "PORT": os.getenv("POSTGRES_PORT"),
-        },
-    }
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.postgresql",
+        "NAME": os.getenv("POSTGRES_DATABASE"),
+        "USER": os.getenv("POSTGRES_USERNAME"),
+        "PASSWORD": os.getenv("POSTGRES_PASSWORD"),
+        "HOST": os.getenv("POSTGRES_HOST"),
+        "PORT": os.getenv("POSTGRES_PORT"),
+    },
+}
 
 AUTH_PASSWORD_VALIDATORS = [
     {