diff --git a/.env.docker b/.env.docker
new file mode 100644
index 0000000..d8f120f
--- /dev/null
+++ b/.env.docker
@@ -0,0 +1,2 @@
+DTTMR_OTLP_ENDPOINT=172.17.0.1:4317
+DTTMR_DATABASE_URL=postgres://postgres:postgres@172.17.0.1:5432/postgres?sslmode=disable&timezone=utc
diff --git a/Dockerfile b/Dockerfile
index a6579e6..b5d75a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,8 @@ COPY go.mod go.sum ./
 
 RUN go mod download
 
-COPY . .
+COPY "./internal" "./internal"
+COPY "./cmd" "./cmd"
 
 RUN go build -o ./server github.com/robindittmar/dttmr-api/cmd/api-server
 
@@ -13,6 +14,7 @@ FROM debian:latest
 
 WORKDIR /app
 
+COPY .env.docker .env
 COPY --from=build /app/server /app/server
 
 EXPOSE 8080
diff --git a/cmd/api-server/main.go b/cmd/api-server/main.go
index 0c0df32..9cf1dab 100644
--- a/cmd/api-server/main.go
+++ b/cmd/api-server/main.go
@@ -36,6 +36,7 @@ func run(serviceName string, serviceVersion string) error {
 	setupLogging()
 
 	slog.Info("starting service", slog.String("service", serviceName), slog.String("version", serviceVersion))
+	defer slog.Info("service shutdown!")
 
 	cfg := config.Load()
 
@@ -97,7 +98,6 @@ func run(serviceName string, serviceVersion string) error {
 		return err
 	}
 
-	slog.Info("service shutdown successful!")
 	return nil
 }