diff --git a/Makefile b/Makefile
index 11cf193bf95dd7592e8efded0504dbe551a3e896..35d5d686a0692a4b1da4f3be8f0d61ba905d7efe 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ clean-build:
 	rm -fr dist/
 	rm -fr .eggs/
 	find . -name '*.egg-info' -exec rm -fr {} +
-	find . -name '*.egg' -exec rm -f {} +
+	find . -name '*.egg' -exec rm -f {} + || true
 
 clean-pyc:
 	find . -name '*.pyc' -exec rm -f {} +
@@ -62,3 +62,4 @@ release: dist
 
 install: clean generate install-requirements
 	python setup.py install
+	python fix_imports.py
diff --git a/fix_imports.py b/fix_imports.py
new file mode 100644
index 0000000000000000000000000000000000000000..d5416a19fdf6f5e9535c3ba19feee8944fcd3176
--- /dev/null
+++ b/fix_imports.py
@@ -0,0 +1,31 @@
+import re
+import os
+
+from pathlib import Path
+
+
+REGEXP = re.compile(
+    r"(from )"
+    r"("
+    r"clients|collaborators|collections|common|delivery|environments|extensions|files|images|invitations"
+    r"|items|locales|members|organizations|references|roles|spaces|status|users|versions.+|"
+    r")"
+    r"( import.*pb2)"
+)
+PERXIS_DIR_NAME = "perxis"
+PERXIS_PATH = (Path(__file__).parent.absolute()).joinpath(PERXIS_DIR_NAME)
+
+
+def main():
+    for path, _, files in os.walk(PERXIS_PATH):
+        for name in files:
+            file_path = os.path.join(path, name)
+            with open(file_path, "r+") as f:
+                text = f.read()
+                result = re.sub(REGEXP, rf"\1{PERXIS_DIR_NAME}.\2\3", text)
+                f.seek(0)
+                f.write(result)
+
+
+if __name__ == "__main__":
+    main()