diff --git a/android/build.gradle b/android/build.gradle
index 515d164..ed87f73 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -17,9 +17,34 @@ buildscript {
 
 apply plugin: 'com.android.library'
 
+def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
+def shouldUseNameSpace = agpVersion >= 7
+def PACKAGE_PROP = "package=\"org.reactnative.maskedview\""
+def manifestOutFile = file("${projectDir}/src/main/AndroidManifest.xml")
+def manifestContent = manifestOutFile.getText()
+if(shouldUseNameSpace){
+      manifestContent = manifestContent.replaceAll(
+        PACKAGE_PROP,
+        ''
+    )  
+} else {
+    if(!manifestContent.contains("$PACKAGE_PROP")){
+        manifestContent = manifestContent.replace(
+            '<manifest',
+            "<manifest $PACKAGE_PROP "
+        )
+    }
+}
+manifestContent.replaceAll("  ", " ")
+manifestOutFile.write(manifestContent)
+
 android {
   compileSdkVersion safeExtGet('compileSdkVersion', 28)
-  namespace = "org.reactnative.maskedview"
+  
+  if(shouldUseNameSpace){
+    namespace = "org.reactnative.maskedview"
+  }
+
   defaultConfig {
     minSdkVersion safeExtGet('minSdkVersion', 16)
     targetSdkVersion safeExtGet('targetSdkVersion', 28)
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index a2f47b6..5d1b95e 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest package="org.reactnative.maskedview" xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>