diff --git a/Dockerfile b/Dockerfile
index 5789cad..1a0652e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,3 +33,5 @@ WORKDIR /srv/tusd-data
 EXPOSE 1080
 ENTRYPOINT ["tusd"]
 CMD ["--hooks-dir","/srv/tusd-hooks"]
+
+USER tusd
diff --git a/cmd/tusd/cli/metrics.go b/cmd/tusd/cli/metrics.go
index d632897..97c4ccb 100644
--- a/cmd/tusd/cli/metrics.go
+++ b/cmd/tusd/cli/metrics.go
@@ -7,6 +7,7 @@ import (
 	"github.com/tus/tusd/pkg/prometheuscollector"
 
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 var MetricsOpenConnections = prometheus.NewGauge(prometheus.GaugeOpts{
@@ -28,5 +29,5 @@ func SetupMetrics(handler *handler.Handler) {
 	prometheus.MustRegister(prometheuscollector.New(handler.Metrics))
 
 	stdout.Printf("Using %s as the metrics path.\n", Flags.MetricsPath)
-	http.Handle(Flags.MetricsPath, prometheus.Handler())
+	http.Handle(Flags.MetricsPath, promhttp.Handler())
 }