diff --git a/.env.sample b/.env.sample
index 76ee09e..5ab896c 100644
--- a/.env.sample
+++ b/.env.sample
@@ -5,7 +5,8 @@ DISCORD_CHANNEL_ID=your-channel-id-here
 # Timing configuration
 SEND_MESSAGE_INTERVAL_MIN=5
 SEND_MESSAGE_INTERVAL_MAX=10
-SEND_MESSAGE_UNIT=second # "second" | "seconds" | "minute" | "minutes" | "millisecond" | "milliseconds"
+# "second" | "seconds" | "minute" | "minutes" | "millisecond" | "milliseconds"
+SEND_MESSAGE_UNIT=second
 
 # Delay before deleting a conspiracy message (eg "3s", "500ms", "1m")
 DELETE_CONSPIRACY_DELAY=3s
diff --git a/Dockerfile b/Dockerfile
index 8741a99..542b47f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,15 @@
 FROM golang:alpine AS builder
-RUN apk --update add ca-certificates
+RUN apk --update add ca-certificates git make bash
+
 WORKDIR /app
 COPY . ./
+
 RUN go mod tidy
-ENV DISCORD_BOT_TOKEN=""
-ENV GIT_COMMIT=""
-ENV BUILD_DATE=""
-RUN go build -ldflags="-s -w -X main.CommitHash=$GIT_COMMIT -X main.BuildDate=$BUILD_DATE" -o bin/swiftspiracybot cmd/bot/main.go
-ENTRYPOINT ["bin/swiftspiracybot"]
+RUN make bot
+
+FROM alpine
+RUN apk --no-cache add ca-certificates
+
+COPY --from=builder /app/bin/bot /bot
+
+ENTRYPOINT ["/bot"]