diff --git a/application/settings.py b/application/settings.py
index 33713ef..eed3a69 100644
--- a/application/settings.py
+++ b/application/settings.py
@@ -102,16 +102,8 @@ WSGI_APPLICATION = 'application.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/3.1/ref/settings/#databases
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'maverickdb',
-        'USER':'maverickdb',
-        'PASSWORD':'maverickdb',
-        'HOST':'localhost',
-        'PORT':'5432'
-    }
-}
+
+DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql', 'NAME': 'maverickdb', 'USER': 'maverickdb', 'PASSWORD': 'maverickdb', 'HOST': 'card-players-unite-postgres', 'PORT': '5432', } }
 
 # Password validation
 # https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
diff --git a/compose.yaml b/compose.yaml
index c38c38c..5305249 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,4 +1,19 @@
 services:
+# The Django Web Application
+    web:
+        build: .
+        container_name: card-players-unite-web
+        ports:
+            - "8000:8000"
+        volumes:
+            - .:/home/app/webapp
+        environment:
+            - POSTGRES_DB=maverickdb
+            - POSTGRES_USER=maverickdb
+            - POSTGRES_PASSWORD=maverickdb
+            - POSTGRES_HOST=card-players-unite-postgres
+        depends_on:
+            - card-players-unite-postgres
 
     card-players-unite-postgres:
 
@@ -26,8 +41,6 @@ services:
  
     card-players-unite-pgadmin:
 
-        build: .
-
         container_name: card-players-unite-pgadmin
 
         image: dpage/pgadmin4