diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..231ef9b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,27 @@
+# syntax=docker/dockerfile:1
+
+FROM golang:1.22 AS build-stage
+WORKDIR /app
+
+# Setup and compile Go
+COPY go.mod go.sum ./
+RUN go mod download
+COPY *.go ./
+RUN CGO_ENABLED=0 GOOS=linux go build -o /hibiscus
+
+FROM alpine:3.19.1 AS deploy-stage
+WORKDIR /
+
+# Bring over the executable
+COPY --from=build-stage /hibiscus /hibiscus
+
+# Copy files
+COPY public public/
+COPY pages pages/
+VOLUME data
+VOLUME config
+
+#USER nonroot:nonroot
+
+EXPOSE 7101
+ENTRYPOINT ["/hibiscus"]
\ No newline at end of file
diff --git a/TODO.md b/TODO.md
index 6fe5f6f..3ffe4fc 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,16 +1,12 @@
+# TODO
+List of things to add to this project
 
-
-# Crucial
-* Load username&password, port from config.txt
+## Crucial
 * Add export feature
 * Add missing frontend pages
 
-# Short term
-* Custom CSS, pico is too big for this project
-* Organise .go files better
-
-# Long-medium term
+## Long-medium term
 * *Go* dependency-less
-* Improve logging, log to files
+* Improve (add?) logging, log to files
 * Make the CLI better
 * Timezones?
\ No newline at end of file