diff --git a/python3/cloudwatch/Makefile b/python3/cloudwatch/Makefile
index 7e43296..4e053a2 100644
--- a/python3/cloudwatch/Makefile
+++ b/python3/cloudwatch/Makefile
@@ -1,6 +1,9 @@
 build:
-	mkdir -p dist/
-	zip -j dist/logzio-cloudwatch-log-shipper.zip src/lambda_function.py ../shipper/shipper.py
+	mkdir -p dist/python3/shipper
+	cp src/lambda_function.py dist
+	cp ../shipper/shipper.py dist/python3/shipper
+
+	(cd dist/ && zip -r logzio-cloudwatch-log-shipper.zip lambda_function.py python3/shipper/*)
 
 clean:
 	rm -rf dist/
\ No newline at end of file
diff --git a/python3/kinesis/Makefile b/python3/kinesis/Makefile
index b549eee..90c1086 100644
--- a/python3/kinesis/Makefile
+++ b/python3/kinesis/Makefile
@@ -1,6 +1,9 @@
 build:
-	mkdir -p dist/
-	zip -j dist/logzio-kinesis-log-shipper.zip src/lambda_function.py ../shipper/shipper.py
+	mkdir -p dist/python3/shipper
+	cp src/lambda_function.py dist
+	cp ../shipper/shipper.py dist/python3/shipper
+
+	(cd dist/ && zip -r logzio-kinesis-log-shipper.zip lambda_function.py python3/shipper/*)
 
 clean:
 	rm -rf dist/
\ No newline at end of file