diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a48bea34b5..71f99dde23d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.36
+
+* All `Android` targets inside common mpp modules now includes JVM code
+
 ## 0.4.35
 
 * `Versions`:
diff --git a/defaultAndroidSettings b/defaultAndroidSettings.gradle
similarity index 100%
rename from defaultAndroidSettings
rename to defaultAndroidSettings.gradle
diff --git a/extensions.gradle b/extensions.gradle
index 0dbac470bef..df5aa0c04e1 100644
--- a/extensions.gradle
+++ b/extensions.gradle
@@ -20,11 +20,11 @@ allprojects {
 
         releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true"
 
-        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization"
-        mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject"
-        mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject"
+        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
+        mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
+        mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"
 
-        defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings"
+        defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
 
         publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
         publishMavenPath = "${rootProject.projectDir.absolutePath}/maven.publish.gradle"
diff --git a/gradle.properties b/gradle.properties
index 529e93a4469..2bf9bf62a82 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -44,5 +44,5 @@ dokka_version=1.4.30
 # Project data
 
 group=dev.inmo
-version=0.4.35
-android_code_version=39
+version=0.4.36
+android_code_version=40
diff --git a/mppAndroidProject b/mppAndroidProject.gradle
similarity index 100%
rename from mppAndroidProject
rename to mppAndroidProject.gradle
diff --git a/mppJavaProject b/mppJavaProject.gradle
similarity index 100%
rename from mppJavaProject
rename to mppJavaProject.gradle
diff --git a/mppProjectWithSerialization b/mppProjectWithSerialization.gradle
similarity index 100%
rename from mppProjectWithSerialization
rename to mppProjectWithSerialization.gradle