diff --git a/.goreleaser.yml b/.goreleaser.yml
index b2f87e4..c4642cb 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -23,6 +23,7 @@ dockers:
   extra_files:
   - health
   use: buildx
+  dockerfile: Dockerfile.goreleaser
   build_flag_templates:
   - "--pull"
   - "--platform=linux/amd64"
@@ -42,6 +43,7 @@ dockers:
   extra_files:
   - health
   use: buildx
+  dockerfile: Dockerfile.goreleaser
   build_flag_templates:
   - "--pull"
   - "--platform=linux/arm64"
diff --git a/Dockerfile b/Dockerfile
index cd601d6..a9ae20c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,26 @@
+FROM golang:1.20-buster AS build
+
+# Create build workspace folder
+WORKDIR /workspace
+ADD . /workspace
+
+# Install updates and build tools
+RUN apt update --yes && \
+    apt install --yes build-essential
+
+# Build the actual binary
+RUN make build
+
+# -- -- -- -- -- --
+
+# Set up image to run the tool
 FROM alpine
 
 # Create main app folder to run from
 WORKDIR /app
 
-# Copy compiled binary to release image
-# (must build the binary before running docker build)
-COPY fail2ban_exporter /app/fail2ban_exporter
+# Copy built binary from build image
+COPY --from=build /workspace/fail2ban_exporter /app
 
 # Setup a healthcheck
 COPY health /app/health
diff --git a/Dockerfile.goreleaser b/Dockerfile.goreleaser
new file mode 100644
index 0000000..cd601d6
--- /dev/null
+++ b/Dockerfile.goreleaser
@@ -0,0 +1,15 @@
+FROM alpine
+
+# Create main app folder to run from
+WORKDIR /app
+
+# Copy compiled binary to release image
+# (must build the binary before running docker build)
+COPY fail2ban_exporter /app/fail2ban_exporter
+
+# Setup a healthcheck
+COPY health /app/health
+RUN apk add curl
+HEALTHCHECK --interval=10s --timeout=4s --retries=3 CMD /app/health
+
+ENTRYPOINT ["/app/fail2ban_exporter"]
diff --git a/Makefile b/Makefile
index 4421341..1d6814c 100644
--- a/Makefile
+++ b/Makefile
@@ -51,5 +51,5 @@ build:
 
 # Build project docker container
 .PHONY: build/docker
-build/docker: build
+build/docker:
 	docker build -t fail2ban-prometheus-exporter .