diff --git a/Dockerfile b/Dockerfile
index 9904ea88..0b1be3b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,9 +10,6 @@ ENV GO111MODULE on
 ENV GOPROXY https://goproxy.io
 COPY --from=xgo / /
 
-ARG TARGETPLATFORM
-RUN go env
-
 RUN apk --update --no-cache add \
     build-base \
     gcc \
@@ -21,11 +18,13 @@ RUN apk --update --no-cache add \
 
 WORKDIR /app
 
-COPY go.mod .
-COPY go.sum .
+COPY . ./
 RUN go mod download
 
-COPY . ./
+ARG TARGETPLATFORM
+ARG TARGETOS
+ARG TARGETARCH
+RUN go env
 RUN go build -ldflags "-w -s -X 'main.version=${VERSION}'" -v -o diun cmd/main.go
 
 FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:latest
diff --git a/internal/config/config.go b/internal/config/config.go
index ebe0a035..f60906e3 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -22,7 +22,7 @@ type Config struct {
 	Providers *model.Providers `yaml:"providers,omitempty" json:"providers,omitempty" validate:"required"`
 }
 
-// Load returns Configuration struct
+// Load returns Config struct
 func Load(cfgfile string) (*Config, error) {
 	cfg := Config{
 		Db:    (&model.Db{}).GetDefaults(),