diff --git a/.gitmodules b/.gitmodules
index 051dd174..c09634ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,7 @@
 	url = https://github.com/eduvpn/ics-openvpn
 [submodule "common/libs/eduvpn-common"]
 	path = common/libs/eduvpn-common
-	url = https://github.com/eduvpn/eduvpn-common
\ No newline at end of file
+	url = https://github.com/eduvpn/eduvpn-common
+[submodule "wireguard"]
+	path = wireguard
+	url = https://codeberg.org/fkooman/wireguard-android
diff --git a/app/build.gradle b/app/build.gradle
index cd12d289..07617dcd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -166,7 +166,7 @@ dependencies {
     // eduVPN common library written in Go, stores all data and does the communication with the servers
     implementation project(path: ':common')
     // WireGuard VPN library
-    implementation(eduvpnVersions.wireguard)
+    implementation project(path: ':wireguard')
 
     // Please try to stay in sync with the versions used in the ics-openvpn module
     implementation(eduvpnVersions.android.appcompat)
diff --git a/gradle.properties b/gradle.properties
index fe661bf8..3404efb2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,7 @@ org.gradle.jvmargs=-Xmx1536M
 
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
\ No newline at end of file
+android.defaults.buildfeatures.buildconfig=true
+
+wireguardPackageName=com.wireguard
+wireguardVersionName=1.0.20231018-eduvpn-fork
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9f1aa712..9f026910 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,4 @@
 [versions]
-wireguard = "1.0.20230706"
 # Please try to stay in sync with the versions used in the ics-openvpn module
 activity-ktx = "1.1.0"
 appcompat = "1.6.1"
@@ -24,7 +23,6 @@ espresso = "3.5.1"
 uiautomator = "2.3.0"
 
 [libraries]
-wireguard = { group = "com.wireguard.android", name = "tunnel", version.ref = "wireguard" }
 android-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 android-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity-ktx" }
 android-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment-ktx" }
@@ -51,4 +49,4 @@ androidx-test-orchestrator = { group = "androidx.test", name = "orchestrator", v
 espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
 uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiautomator" }
 
-[plugins]
\ No newline at end of file
+[plugins]
diff --git a/settings.gradle b/settings.gradle
index 2014c7d5..89e47f17 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -27,10 +27,15 @@ dependencyResolutionManagement {
         eduvpnVersions {
             from(files('gradle/libs.versions.toml'))
         }
+        wireguardVersions {
+            from(files('wireguard/gradle/libs.versions.toml'))
+        }
     }
 }
 
 include ':app'
 include ':ics-openvpn-main'
 project(':ics-openvpn-main').projectDir = new File(rootDir, '/ics-openvpn/main')
-include ':common'
\ No newline at end of file
+include ':common'
+include ':wireguard'
+project(':wireguard').projectDir = new File(rootDir, '/wireguard/tunnel')
diff --git a/wireguard b/wireguard
new file mode 160000
index 00000000..2055ab96
--- /dev/null
+++ b/wireguard
@@ -0,0 +1 @@
+Subproject commit 2055ab9671aa6d8eeee0567f45449eb3237f8b8f