diff --git a/android/build.gradle b/android/build.gradle
index 1f9c6f56..970f7c6e 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -92,8 +92,8 @@ android {
         java.srcDirs += [
           "src/newarch",
           // Codegen specs
-          "generated/java",
-          "generated/jni"
+          "${project.buildDir}/generated/source/codegen/java",
+          "${project.buildDir}/generated/source/codegen/jni"
         ]
       } else {
         java.srcDirs += ["src/oldarch"]
diff --git a/package.json b/package.json
index be4b8d5a..585bc584 100644
--- a/package.json
+++ b/package.json
@@ -62,11 +62,10 @@
   },
   "codegenConfig": {
     "name": "RNVoiceSpec",
-    "type": "all",
+    "type": "modules",
     "jsSrcsDir": "src",
     "outputDir": {
-      "ios": "ios/generated",
-      "android": "android/generated"
+      "ios": "ios/generated"
     },
     "android": {
       "javaPackageName": "com.wenkesj.voice"