diff --git a/image/Dockerfile b/Dockerfile
similarity index 100%
rename from image/Dockerfile
rename to Dockerfile
diff --git a/bot/src/com/github/corruptedinc/corruptedmainframe/Config.kt b/bot/src/com/github/corruptedinc/corruptedmainframe/Config.kt
index aa0696c..7181a4d 100644
--- a/bot/src/com/github/corruptedinc/corruptedmainframe/Config.kt
+++ b/bot/src/com/github/corruptedinc/corruptedmainframe/Config.kt
@@ -3,7 +3,7 @@ package com.github.corruptedinc.corruptedmainframe
 import com.beust.klaxon.Klaxon
 import java.io.File
 
-class Config(val token: String, val permaAdmins: List<String>, val databaseUrl: String, val databaseDriver: String, val gitUrl: String, val blueAllianceToken: String) {
+class Config(val token: String, val permaAdmins: List<String>, val databaseUrl: String, val databaseDriver: String, val gitUrl: String, val blueAllianceToken: String, val databaseUser: String, val databasePassword: String) {
     companion object {
         fun load(file: File): Config? {
             // TODO: replace klaxon with something else, jackson is seemingly also in the jar
diff --git a/bot/src/com/github/corruptedinc/corruptedmainframe/discord/Bot.kt b/bot/src/com/github/corruptedinc/corruptedmainframe/discord/Bot.kt
index 5666ddb..3712b86 100644
--- a/bot/src/com/github/corruptedinc/corruptedmainframe/discord/Bot.kt
+++ b/bot/src/com/github/corruptedinc/corruptedmainframe/discord/Bot.kt
@@ -57,6 +57,8 @@ class Bot(val config: Config) {
         Database.connect(
             config.databaseUrl,
             driver = config.databaseDriver,
+            user = config.databaseUser,
+            password = config.databasePassword,
             databaseConfig = DatabaseConfig { useNestedTransactions = true }  // TODO: make individual functions not start their own transactions
         ), this)
 //    private val buttonListeners = mutableListOf<(ButtonInteractionEvent) -> Unit>()
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000..c9a18f2
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,25 @@
+services:
+  bot:
+    build: .
+    environment:
+      POSTGRES_PASSWORD: postgres
+    depends_on:
+      - db
+  db:
+    image: postgres:latest
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: postgres
+    ports:
+      - "5432:5432"
+    restart: always
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+
+
+networks:
+  default:
+
+volumes:
+  pgdata:
\ No newline at end of file
diff --git a/image/build.sh b/image/build.sh
deleted file mode 100755
index 8e2aa19..0000000
--- a/image/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Make sure it's being run in the correct dir
-if [ -d "bot" ]; then
-    cd image || exit 1;
-fi
-
-# Copy the latest jar to the current dir
-cp ../bot/build/libs/corrupted-mainframe.jar .;
-
-# Build the image (automatically given the 'latest' tag)
-docker build -t "corrupted-inc/corrupted-mainframe" .