diff --git a/babybuddy/settings/base.py b/babybuddy/settings/base.py
index d90b3be5..89971d58 100644
--- a/babybuddy/settings/base.py
+++ b/babybuddy/settings/base.py
@@ -101,12 +101,19 @@ TEMPLATES = [
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'data/db.sqlite3'),
-    }
-}
+config = {'ENGINE': os.getenv('DB_ENGINE') or 'django.db.backends.sqlite3'}
+if os.getenv('DB_NAME'):
+    config['NAME'] = os.getenv('DB_NAME')
+if os.getenv('DB_USER'):
+    config['USER'] = os.getenv('DB_USER')
+if os.environ.get('DB_PASSWORD') or os.environ.get('POSTGRES_PASSWORD'):
+    config['PASSWORD'] = os.environ.get('DB_PASSWORD') or os.environ.get('POSTGRES_PASSWORD')
+if os.getenv('DB_HOST'):
+    config['HOST'] = os.getenv('DB_HOST')
+if os.getenv('DB_PORT'):
+    config['PORT'] = os.getenv('DB_PORT')
+
+DATABASES = {'default': config}
 
 
 # Cache
diff --git a/babybuddy/settings/docker.py b/babybuddy/settings/docker.py
deleted file mode 100644
index 2300780e..00000000
--- a/babybuddy/settings/docker.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from .base import *
-
-
-# Database
-# https://docs.djangoproject.com/en/3.0/ref/settings/#databases
-
-# Load settings from env file / variables with fallback defaults to support current psql deployment
-DATABASES = {
-    'default': {
-        'ENGINE': os.getenv('DB_ENGINE') or 'django.db.backends.postgresql_psycopg2',
-        'NAME': os.getenv('DB_NAME') or 'postgres',
-        'USER': os.getenv('DB_USER') or 'postgres',
-        'PASSWORD': os.environ.get('DB_PASSWORD') or os.environ.get('POSTGRES_PASSWORD'),
-        'HOST': os.getenv('DB_HOST') or 'db',
-        'PORT': os.getenv('DB_PORT') or 5432,
-    }
-}