diff --git a/.gitignore b/.gitignore
index d034c89dcc..b2c3f77f8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -179,8 +179,8 @@ dmypy.json
 .flattened-pom.xml
 
 sdk/python/docs/html
-sdk/python/feast/core/
-sdk/python/feast/serving/
-sdk/python/feast/storage/
-sdk/python/feast/types/
-sdk/python/tensorflow_metadata
\ No newline at end of file
+
+# Generated python code
+*_pb2.py
+*_pb2.pyi
+*_pb2_grpc.py
diff --git a/.prow/config.yaml b/.prow/config.yaml
index af41aab759..9401ba8334 100644
--- a/.prow/config.yaml
+++ b/.prow/config.yaml
@@ -236,7 +236,7 @@ postsubmits:
         - sh
         - -c
         - |
-          infra/scripts/publish-python-sdk.sh \
+          make compile-protos-python && infra/scripts/publish-python-sdk.sh \
             --directory-path sdk/python --repository pypi
         volumeMounts:
         - name: pypirc
diff --git a/sdk/python/feast/core/__init__.py b/sdk/python/feast/core/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sdk/python/feast/serving/__init__.py b/sdk/python/feast/serving/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sdk/python/feast/storage/__init__.py b/sdk/python/feast/storage/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sdk/python/feast/types/__init__.py b/sdk/python/feast/types/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sdk/python/tensorflow_metadata/__init__.py b/sdk/python/tensorflow_metadata/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sdk/python/tensorflow_metadata/proto/__init__.py b/sdk/python/tensorflow_metadata/proto/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sdk/python/tensorflow_metadata/proto/v0/__init__.py b/sdk/python/tensorflow_metadata/proto/v0/__init__.py
new file mode 100644
index 0000000000..e69de29bb2