diff --git a/Makefile b/Makefile
index 6ad1f50..820f893 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ run:
 # As a workaround, we just have a stop command that stops the container.
 stop:
 	@ docker stop -t 2 fej
+	@ docker stop fej_db
 .PHONY: stop
 
 # This attaches to the running container, essentially giving the same result as
@@ -44,6 +45,11 @@ logs:
 	@ docker logs -f fej
 .PHONY: logs
 
+# This just starts up a shell inside the fej container
+sh:
+	@ docker exec -it fej sh
+.PHONY: sh
+
 # Builds the debug version, and runs the tests (but doesn't detach).
 test:
 	@ ./build -m dev -a run -l -- test --no-fail-fast
diff --git a/build b/build
index d7d86a3..484a8ab 100755
--- a/build
+++ b/build
@@ -72,7 +72,21 @@ if [[ "$action" = push ]]; then
         [[ "$tag" != "$tags" ]] && docker rmi "$image:$tag"
     done
 
- elif [[ "$action" = run ]]; then
+elif [[ "$action" = run ]]; then
+    # Create the network & start the database container
+    docker network create fej
+    docker volume create fej_db-data
+
+    docker run --rm \
+        --detach \
+        --name fej_db \
+        --network fej \
+        -e "POSTGRES_DB=fej" \
+        -e "POSTGRES_USER=fej" \
+        -e "POSTGRES_PASSWORD=fej" \
+        -v 'fej_db-data:/var/lib/postgresql/data' \
+        postgres:13-alpine
+
     if [[ "$mode" = "dev" ]]; then
         # Create caching volumes if needed (they need to be named)
         docker volume create fej_build-cache
@@ -87,5 +101,6 @@ if [[ "$action" = push ]]; then
         --tty \
         --publish 8000:8000 \
         --name fej \
+        --network fej \
         "$image$([[ "$mode" != "rel" ]] && echo "-dev"):$tags" "$@"
 fi