diff --git a/docker/Dockerfile.agent.linux.amd64 b/docker/Dockerfile.agent.linux.amd64
index 3dd9362dc..bb9899a88 100644
--- a/docker/Dockerfile.agent.linux.amd64
+++ b/docker/Dockerfile.agent.linux.amd64
@@ -1,5 +1,5 @@
 FROM alpine:3.11 as alpine
-RUN apk add -U --no-cache ca-certificates
+RUN apk add -U --no-cache ca-certificates tzdata
 
 FROM alpine:3.11
 ENV GODEBUG netdns=go
@@ -12,6 +12,7 @@ ADD release/linux/amd64/drone-agent /bin/
 RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
 
 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo
 
 LABEL com.centurylinklabs.watchtower.stop-signal="SIGINT"
 
diff --git a/docker/Dockerfile.controller.linux.amd64 b/docker/Dockerfile.controller.linux.amd64
index 0a0953c9f..8161dc2cc 100644
--- a/docker/Dockerfile.controller.linux.amd64
+++ b/docker/Dockerfile.controller.linux.amd64
@@ -1,5 +1,5 @@
 FROM alpine:3.11 as alpine
-RUN apk add -U --no-cache ca-certificates
+RUN apk add -U --no-cache ca-certificates tzdata
 
 FROM alpine:3.11
 ENV GODEBUG netdns=go
@@ -10,5 +10,6 @@ ENV DRONE_RUNNER_CAPACITY=1
 ADD release/linux/amd64/drone-controller /bin/
 
 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo
 
 ENTRYPOINT ["/bin/drone-controller"]
diff --git a/docker/Dockerfile.controller.linux.arm b/docker/Dockerfile.controller.linux.arm
index e5af6e16a..be5091259 100644
--- a/docker/Dockerfile.controller.linux.arm
+++ b/docker/Dockerfile.controller.linux.arm
@@ -1,5 +1,5 @@
 FROM alpine:3.11 as alpine
-RUN apk add -U --no-cache ca-certificates
+RUN apk add -U --no-cache ca-certificates tzdata
 
 FROM alpine:3.11
 ENV GODEBUG=netdns=go
@@ -11,5 +11,6 @@ ENV DRONE_RUNNER_VARIANT=v7
 ADD release/linux/arm/drone-controller /bin/
 
 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo
 
 ENTRYPOINT ["/bin/drone-controller"]
diff --git a/docker/Dockerfile.controller.linux.arm64 b/docker/Dockerfile.controller.linux.arm64
index d872c2dcf..54a1ca02c 100644
--- a/docker/Dockerfile.controller.linux.arm64
+++ b/docker/Dockerfile.controller.linux.arm64
@@ -1,5 +1,5 @@
 FROM alpine:3.11 as alpine
-RUN apk add -U --no-cache ca-certificates
+RUN apk add -U --no-cache ca-certificates tzdata
 
 FROM alpine:3.11
 ENV GODEBUG=netdns=go
@@ -11,5 +11,6 @@ ENV DRONE_RUNNER_VARIANT=v8
 ADD release/linux/arm64/drone-controller /bin/
 
 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo
 
 ENTRYPOINT ["/bin/drone-controller"]
diff --git a/docker/Dockerfile.server.linux.amd64 b/docker/Dockerfile.server.linux.amd64
index 3e669ca17..1f4d604b1 100644
--- a/docker/Dockerfile.server.linux.amd64
+++ b/docker/Dockerfile.server.linux.amd64
@@ -1,7 +1,7 @@
 # docker build --rm -f docker/Dockerfile -t drone/drone .
 
 FROM alpine:3.11 as alpine
-RUN apk add -U --no-cache ca-certificates
+RUN apk add -U --no-cache ca-certificates tzdata
 
 FROM alpine:3.11
 EXPOSE 80 443
@@ -21,6 +21,7 @@ ENV DRONE_DATADOG_ENABLED=true
 ENV DRONE_DATADOG_ENDPOINT=https://stats.drone.ci/api/v1/series
 
 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo
 
 ADD release/linux/amd64/drone-server /bin/
 ENTRYPOINT ["/bin/drone-server"]
\ No newline at end of file
diff --git a/docker/Dockerfile.server.linux.arm b/docker/Dockerfile.server.linux.arm
index 1b6ce60b7..3f803d153 100644
--- a/docker/Dockerfile.server.linux.arm
+++ b/docker/Dockerfile.server.linux.arm
@@ -1,7 +1,7 @@
 # docker build --rm -f docker/Dockerfile -t drone/drone .
 
 FROM alpine:3.11 as alpine
-RUN apk add -U --no-cache ca-certificates
+RUN apk add -U --no-cache ca-certificates tzdata
 
 FROM alpine:3.11
 EXPOSE 80 443
@@ -21,6 +21,7 @@ ENV DRONE_DATADOG_ENABLED=true
 ENV DRONE_DATADOG_ENDPOINT=https://stats.drone.ci/api/v1/series
 
 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo
 
 ADD release/linux/arm/drone-server /bin/
 ENTRYPOINT ["/bin/drone-server"]
\ No newline at end of file
diff --git a/docker/Dockerfile.server.linux.arm64 b/docker/Dockerfile.server.linux.arm64
index b83678b14..f0be82848 100644
--- a/docker/Dockerfile.server.linux.arm64
+++ b/docker/Dockerfile.server.linux.arm64
@@ -1,7 +1,7 @@
 # docker build --rm -f docker/Dockerfile -t drone/drone .
 
 FROM alpine:3.11 as alpine
-RUN apk add -U --no-cache ca-certificates
+RUN apk add -U --no-cache ca-certificates tzdata
 
 FROM alpine:3.11
 EXPOSE 80 443
@@ -21,6 +21,7 @@ ENV DRONE_DATADOG_ENABLED=true
 ENV DRONE_DATADOG_ENDPOINT=https://stats.drone.ci/api/v1/series
 
 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo
 
 ADD release/linux/arm64/drone-server /bin/
 ENTRYPOINT ["/bin/drone-server"]
\ No newline at end of file