diff --git a/CHANGELOG.md b/CHANGELOG.md
index df9dbe65..af689185 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 1. [#290](https://github.com/influxdata/influxdb-client-python/pull/290): `Threshold` domain models mapping 
 1. [#290](https://github.com/influxdata/influxdb-client-python/pull/290): `DashboardService` responses types
 1. [#303](https://github.com/influxdata/influxdb-client-python/pull/303): Backslash escaping in serialization to Line protocol
+1. [#312](https://github.com/influxdata/influxdb-client-python/pull/312): Zip structure for AWS Lambda
 
 ## 1.19.0 [2021-07-09]
 
diff --git a/docker/aws_lambda_layer/Dockerfile b/docker/aws_lambda_layer/Dockerfile
index 6bda2d72..4cfb3037 100644
--- a/docker/aws_lambda_layer/Dockerfile
+++ b/docker/aws_lambda_layer/Dockerfile
@@ -11,5 +11,6 @@ RUN source lambda/bin/activate
 # Python dependencies to be included in output zip file:
 RUN python3.8 -m pip install --no-cache-dir influxdb-client[ciso] -t /install/python
 # Create zip file
-RUN zip -r /install/python.zip python/
-VOLUME ["/install"]
\ No newline at end of file
+WORKDIR /install/python
+RUN zip -r ../python.zip .
+VOLUME ["/install"]