diff --git a/app/build.gradle b/app/build.gradle
index e1c4c729..ab7677e8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -59,7 +59,7 @@ dependencies {
     kapt 'com.google.dagger:dagger-compiler:2.33'
 
     // Relaynet
-    implementation 'tech.relaycorp:relaydroid:1.3.4'
+    implementation 'tech.relaycorp:relaydroid:1.4.0'
 
     // Preferences
     implementation 'androidx.preference:preference-ktx:1.1.1'
diff --git a/app/src/main/java/tech/relaycorp/ping/App.kt b/app/src/main/java/tech/relaycorp/ping/App.kt
index 830285e0..c3bd51e6 100644
--- a/app/src/main/java/tech/relaycorp/ping/App.kt
+++ b/app/src/main/java/tech/relaycorp/ping/App.kt
@@ -9,8 +9,8 @@ import kotlinx.coroutines.launch
 import tech.relaycorp.ping.di.AppComponent
 import tech.relaycorp.ping.di.AppModule
 import tech.relaycorp.ping.di.DaggerAppComponent
+import tech.relaycorp.relaydroid.GatewayClient
 import tech.relaycorp.relaydroid.Relaynet
-import tech.relaycorp.relaydroid.RelaynetTemp.GatewayClient
 import javax.inject.Inject
 
 class App : Application() {
diff --git a/app/src/main/java/tech/relaycorp/ping/MainActivity.kt b/app/src/main/java/tech/relaycorp/ping/MainActivity.kt
index 362fae5f..fdbbb187 100644
--- a/app/src/main/java/tech/relaycorp/ping/MainActivity.kt
+++ b/app/src/main/java/tech/relaycorp/ping/MainActivity.kt
@@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import tech.relaycorp.relaydroid.RelaynetTemp
+import tech.relaycorp.relaydroid.GatewayClient
 import tech.relaycorp.relaydroid.endpoint.FirstPartyEndpoint
 import tech.relaycorp.relaydroid.endpoint.PublicThirdPartyEndpoint
 import tech.relaycorp.relaydroid.messaging.ParcelId
@@ -40,7 +40,7 @@ class MainActivity : AppCompatActivity() {
         lifecycleScope.launch {
             send.isEnabled = false
             withContext(backgroundContext) {
-                RelaynetTemp.GatewayClient.bind()
+                GatewayClient.bind()
                 sender = FirstPartyEndpoint.register()
                 recipient = PublicThirdPartyEndpoint.import(
                     "ping.awala.services",
@@ -86,7 +86,7 @@ class MainActivity : AppCompatActivity() {
                     recipientEndpoint = recipient,
                     parcelId = id
                 )
-                RelaynetTemp.GatewayClient.sendMessage(outgoingMessage)
+                GatewayClient.sendMessage(outgoingMessage)
                 val pingMessage = PingMessage(outgoingMessage.parcelId.value)
                 repository.set(pingMessage)
             }
@@ -101,6 +101,6 @@ class MainActivity : AppCompatActivity() {
 
     override fun onDestroy() {
         super.onDestroy()
-        RelaynetTemp.GatewayClient.unbind()
+        GatewayClient.unbind()
     }
 }