diff --git a/storage/demo/build.gradle b/storage/demo/build.gradle
index 4fcee90e..ef3625b7 100644
--- a/storage/demo/build.gradle
+++ b/storage/demo/build.gradle
@@ -37,7 +37,7 @@ android {
     }
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11.toString()
-        freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+        freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
     lintOptions {
         disable "DialogFragmentCallbacksDetector",
diff --git a/storage/lib/Android.bp b/storage/lib/Android.bp
index aa1d6750..227fecfb 100644
--- a/storage/lib/Android.bp
+++ b/storage/lib/Android.bp
@@ -40,7 +40,7 @@ android_library {
         enabled: false,
     },
     kotlincflags: [
-        "-Xopt-in=kotlin.RequiresOptIn",
+        "-opt-in=kotlin.RequiresOptIn",
     ],
 }
 
diff --git a/storage/lib/build.gradle b/storage/lib/build.gradle
index 2e16e9ff..2b8db4d3 100644
--- a/storage/lib/build.gradle
+++ b/storage/lib/build.gradle
@@ -39,7 +39,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11.toString()
         languageVersion = "1.7"
-        freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
+        freeCompilerArgs += '-opt-in=kotlin.RequiresOptIn'
         freeCompilerArgs += '-Xexplicit-api=strict'
     }
     protobuf {