diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1c87422..1308830 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
-            android:usesCleartextTraffic="true"
             tools:ignore="GoogleAppIndexingWarning">
         <activity
                 android:name="org.yggdrasil.app.crispa.AboutActivity"
diff --git a/build.gradle b/build.gradle
index fa11fe1..a5b986b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/yggdrasil/Makefile b/yggdrasil/Makefile
index d207720..c7cd400 100644
--- a/yggdrasil/Makefile
+++ b/yggdrasil/Makefile
@@ -1,7 +1,5 @@
 all:
-	cd yggdrasil-extras; \
-		gomobile bind -v -target android -tags mobile -o yggdrasil.aar \
-		github.com/yggdrasil-network/yggdrasil-extras/src/mobile \
-		github.com/yggdrasil-network/yggdrasil-go/src/config
-	mv -f yggdrasil-extras/yggdrasil.aar yggdrasil.aar;
-	mv -f yggdrasil-extras/yggdrasil-sources.jar yggdrasil-sources.jar;
+	cd yggdrasil && \
+		ANDROID=true ./contrib/mobile/build
+	mv -f yggdrasil/yggdrasil.aar yggdrasil.aar;
+	mv -f yggdrasil/yggdrasil-sources.jar yggdrasil-sources.jar;
diff --git a/yggdrasil/yggdrasil-go b/yggdrasil/yggdrasil-go
new file mode 160000
index 0000000..42d4298
--- /dev/null
+++ b/yggdrasil/yggdrasil-go
@@ -0,0 +1 @@
+Subproject commit 42d4298e197e9f4455b9ed34e9b49847cc10af63