diff --git a/app/build.gradle b/app/build.gradle
index 4a452a07c..b11416fa8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -157,7 +157,7 @@ def abiPostFix = ['armeabi-v7a' : 1,
                   'universal'   : 5]
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion androidCompileSdkVersion
     buildToolsVersion '29.0.3'
     useLibrary 'org.apache.http.legacy'
 
diff --git a/gradle.properties b/gradle.properties
index 8ffdbfc90..a017cc944 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,8 @@ android.useAndroidX=true
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2048m
 
-kotlinVersion=1.4.20
+androidCompileSdkVersion=30
+kotlinVersion=1.4.32
 kovenantVersion=3.3.0
 curve25519Version=0.5.0
 protobufVersion=2.5.0
diff --git a/libsession/build.gradle b/libsession/build.gradle
index 6b2c1853b..3b487b81c 100644
--- a/libsession/build.gradle
+++ b/libsession/build.gradle
@@ -3,6 +3,10 @@ plugins {
     id 'kotlin-android'
 }
 
+android {
+    compileSdkVersion androidCompileSdkVersion
+}
+
 dependencies {
     implementation project(":libsignal")
     implementation "com.goterl.lazycode:lazysodium-android:4.2.0@aar"
diff --git a/libsession/src/main/AndroidManifest.xml b/libsession/src/main/AndroidManifest.xml
index 2db400737..d9af5e1f8 100644
--- a/libsession/src/main/AndroidManifest.xml
+++ b/libsession/src/main/AndroidManifest.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.session.libsession">
-
-</manifest>
\ No newline at end of file
+<manifest package="org.session.libsession" />
\ No newline at end of file
diff --git a/libsignal/build.gradle b/libsignal/build.gradle
index b7450a50b..12ca86a86 100644
--- a/libsignal/build.gradle
+++ b/libsignal/build.gradle
@@ -2,6 +2,10 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven'
 apply plugin: 'kotlin-android'
 
+android {
+    compileSdkVersion androidCompileSdkVersion
+}
+
 repositories {
     mavenCentral()
 }