diff --git a/.env.example b/.env.example
index b305cc0b..7106da6a 100644
--- a/.env.example
+++ b/.env.example
@@ -1,9 +1,11 @@
 SECRET_KEY=
 DEBUG=False
 HOST_PROTO=http
-HOST_URL="localhost, 0.0.0.0"
+HOST_URL="0.0.0.0"
+HOST_ALLOWED_URLS="localhost, 0.0.0.0"
+HOST_PORT=8000
 
-USE_VENV=1
+USE_DOCKER=0 # Set 1 to use Docker
 
 DATABASE_NAME=djdb
 DATABASE_USER=dju
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a41746c..4eb39997 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,4 +45,3 @@ jobs:
           make test-unit
         env:
           DJANGO_DEBUG: True
-          USE_VENV: 1
diff --git a/Dockerfile b/Dockerfile
index 584c074a..b86b6aa5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,4 +44,4 @@ USER app
 
 ENTRYPOINT ["./entrypoint.sh"]
 
-CMD ["poetry", "run", "python", "manage.py", "runserver", "0.0.0.0:8000"]
+CMD ["poetry", "run", "python", "manage.py", "runserver", "0.0.0.0:${HOST_PORT}"]
diff --git a/Makefile b/Makefile
index 24592381..df764926 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-ifeq ($(USE_VENV),1)
-	EXEC_CMD :=
-else
+ifeq ($(USE_DOCKER),1)
 	EXEC_CMD := docker-compose exec -ti web
+else
+	EXEC_CMD :=
 endif
 
 .PHONY: web-prompt
diff --git a/config/settings.py b/config/settings.py
index f1ab7ed5..36ae3a8f 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -35,9 +35,9 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True if os.getenv("DEBUG") == "True" else False
 
-HOST_URL = os.getenv("HOST_URL", "127.0.0.1, localhost")
+HOST_ALLOWED_URLS = os.getenv("HOST_ALLOWED_URLS", "127.0.0.1, localhost")
 
-ALLOWED_HOSTS = HOST_URL.replace(" ", "").split(",")
+ALLOWED_HOSTS = HOST_ALLOWED_URLS.replace(" ", "").split(",")
 
 # Application definition
 
@@ -195,7 +195,7 @@
 
 # Base URL to use when referring to full URLs within the Wagtail admin backend -
 # e.g. in notification emails. Don't include '/admin' or a trailing slash
-WAGTAILADMIN_BASE_URL = f"{os.getenv('HOST_PROTO', 'https')}://{HOST_URL[-1]}"
+WAGTAILADMIN_BASE_URL = f"{os.getenv('HOST_PROTO', 'https')}://{os.getenv('HOST_URL', 'localhost')}"
 
 # Disable Gravatar service
 WAGTAIL_GRAVATAR_PROVIDER_URL = None
diff --git a/docker-compose.yml b/docker-compose.yml
index 77917f5c..ec4969a8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,21 +4,21 @@ services:
   db:
     image: postgres:14.5-alpine
     environment:
-      POSTGRES_USER: dju
-      POSTGRES_PASSWORD: djpwd
-      POSTGRES_DB: djdb
-      PGPORT: 8432
+      POSTGRES_USER: ${DATABASE_USER}
+      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
+      POSTGRES_DB: ${DATABASE_NAME}
+      PGPORT: ${DATABASE_PORT}
     ports:
-      - "8432:8432"
+      - "${DATABASE_PORT}:${DATABASE_PORT}"
     volumes:
       - postgres_data:/var/lib/postgresql/data
 
   web:
     build: .
     environment:
-      DATABASE_URL: postgres://dju:djpwd@db:8432/djdb
+      DATABASE_URL: postgres://${DATABASE_USER}:${DATABASE_PASSWORD}@db:${DATABASE_PORT}/${DATABASE_NAME}
     ports:
-      - "8000:8000"
+      - "${HOST_PORT}:${HOST_PORT}"
     volumes:
       - .:/app
     depends_on: