diff --git a/app/build.gradle b/app/build.gradle
index 9181ceb2..247a8bca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
     def splitAPKsForReleaseBuilds = System.getenv("TERMUX_SPLIT_APKS_FOR_RELEASE_BUILDS") ?: "0" // F-Droid does not support split APKs #1904
 
     dependencies {
-        implementation "androidx.annotation:annotation:1.2.0"
-        implementation "androidx.core:core:1.6.0-rc01"
+        implementation "androidx.annotation:annotation:1.3.0"
+        implementation "androidx.core:core:1.6.0"
         implementation "androidx.drawerlayout:drawerlayout:1.1.1"
         implementation "androidx.preference:preference:1.1.1"
         implementation "androidx.viewpager:viewpager:1.0.0"
diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle
index 5bf11e10..5867765f 100644
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
 
     dependencies {
-        implementation "androidx.annotation:annotation:1.2.0"
+        implementation "androidx.annotation:annotation:1.3.0"
         api project(":terminal-emulator")
     }
 
diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle
index a4891703..5bbd41c8 100644
--- a/termux-shared/build.gradle
+++ b/termux-shared/build.gradle
@@ -6,9 +6,8 @@ android {
 
     dependencies {
         implementation 'androidx.appcompat:appcompat:1.3.1'
-        implementation "androidx.annotation:annotation:1.2.0"
-        implementation "androidx.core:core:1.6.0-rc01"
-        implementation "androidx.window:window:1.0.0-alpha09"
+        implementation "androidx.annotation:annotation:1.3.0"
+        implementation "androidx.core:core:1.6.0"
         implementation 'com.google.android.material:material:1.4.0'
         implementation "com.google.guava:guava:24.1-jre"
         implementation "io.noties.markwon:core:$markwonVersion"
@@ -16,6 +15,10 @@ android {
         implementation "io.noties.markwon:linkify:$markwonVersion"
         implementation "io.noties.markwon:recycler:$markwonVersion"
 
+        // Do not increment version higher than 1.0.0-alpha09 since it will break ViewUtils and needs to be looked into
+        // noinspection GradleDependency
+        implementation "androidx.window:window:1.0.0-alpha09"
+
         // Do not increment version higher than 2.5 or there
         // will be runtime exceptions on android < 8
         // due to missing classes like java.nio.file.Path.