diff --git a/Dockerfile b/Dockerfile
index 85097bd7..8a501eb3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,15 +7,14 @@ RUN pnpm install --frozen-lockfile --shamefully-hoist
 
 # Build Nuxt
 FROM node:18-alpine AS frontend-builder
-WORKDIR  /app
-RUN npm install -g pnpm
-COPY frontend .
+WORKDIR /app
+COPY frontend ./
 COPY --from=frontend-dependencies /app/node_modules ./node_modules
 RUN pnpm build
 
 FROM golang:alpine AS builder-dependencies
 WORKDIR /go/src/app
-COPY ./backend .
+COPY ./backend/go.mod ./backend/go.sum ./
 RUN go mod download
 
 # Build API
@@ -23,47 +22,23 @@ FROM golang:alpine AS builder
 ARG BUILD_TIME
 ARG COMMIT
 ARG VERSION
-RUN apk update && \
-    apk upgrade && \
-    apk add --update git build-base gcc g++
+RUN apk update && apk upgrade && apk add --no-cache git build-base gcc g++
 
 WORKDIR /go/src/app
 COPY ./backend .
 RUN rm -rf ./app/api/public
 COPY --from=frontend-builder /app/.output/public ./app/api/static/public
 COPY --from=builder-dependencies /go/pkg/mod /go/pkg/mod
-RUN --mount=type=cache,target=/root/.cache/go-build  \
+RUN --mount=type=cache,target=/root/.cache/go-build \
     CGO_ENABLED=0 GOOS=linux go build \
-    -ldflags "-s -w -X main.commit=$COMMIT -X main.buildTime=$BUILD_TIME -X main.version=$VERSION"  \
-    -o /go/bin/api \
-    -v ./app/api/*.go
-
-FROM gcr.io/distroless/java:latest
+    -ldflags "-s -w -X main.commit=$COMMIT -X main.buildTime=$BUILD_TIME -X main.version=$VERSION" \
+    -o /go/bin/api ./app/api/*.go
 
 # Production Stage
 FROM alpine:latest
-
-ENV HBOX_MODE=production
-ENV HBOX_STORAGE_DATA=/data/
-ENV HBOX_STORAGE_SQLITE_URL=/data/homebox.db?_pragma=busy_timeout=2000&_pragma=journal_mode=WAL&_fk=1
-
-RUN apk --no-cache add ca-certificates
-RUN mkdir /app
-COPY --from=builder /go/bin/api /app
-
-RUN chmod +x /app/api
-RUN apk add --no-cache wget
-
-LABEL Name=homebox Version=0.0.1
-LABEL org.opencontainers.image.source="https://github.com/sysadminsmedia/homebox"
-EXPOSE 7745
 WORKDIR /app
-HEALTHCHECK --interval=30s \
-            --timeout=5s \
-            --start-period=5s \
-            --retries=3 \
-            CMD [ "/usr/bin/wget", "--no-verbose", "--tries=1", "-O -", "http://localhost:7745/api/v1/status" ]
-VOLUME [ "/data" ]
+COPY --from=builder /go/bin/api /app/api
+RUN apk --no-cache add ca-certificates wget
 
-ENTRYPOINT [ "/app/api" ]
-CMD [ "/data/config.yml" ]
+ENTRYPOINT ["/app/api"]
+CMD ["/data/config.yml"]