diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index 3fc6f9505a..94e2bfc8f5 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -5,8 +5,7 @@ ARG N8N_VERSION
 RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!" ; exit 1; fi
 
 # Update everything and install needed dependencies
-RUN apk add --update \
-	graphicsmagick
+RUN apk add --update graphicsmagick tzdata
 
 # # Set a custom user to not have n8n run as root
 USER root
@@ -19,4 +18,7 @@ RUN apk --update add --virtual build-dependencies python build-base && \
 
 WORKDIR /data
 
-CMD "n8n"
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+CMD ["n8n"]
diff --git a/docker/images/n8n/docker-entrypoint.sh b/docker/images/n8n/docker-entrypoint.sh
new file mode 100755
index 0000000000..fe4561efb1
--- /dev/null
+++ b/docker/images/n8n/docker-entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+ln -s "/usr/share/zoneinfo/${GENERIC_TIMEZONE:-America/New_York}" /etc/localtime
+
+exec "$@"