diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1d045324..6ce2eeae 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -103,9 +103,8 @@ dependencies {
     implementation(project(":connectors:analytics:comscore"))
     implementation(libs.comscore)
 
-    // FIXME Re-enable Yospace connector
-    // implementation(project(":connectors:yospace"))
-    // implementation(libs.yospace)
+    implementation(project(":connectors:yospace"))
+    implementation(libs.yospace)
 
     implementation(project(":connectors:uplynk"))
 }
diff --git a/app/src/main/java/com/theoplayer/android/connector/MainActivity.kt b/app/src/main/java/com/theoplayer/android/connector/MainActivity.kt
index 5be4300e..c3d3f082 100644
--- a/app/src/main/java/com/theoplayer/android/connector/MainActivity.kt
+++ b/app/src/main/java/com/theoplayer/android/connector/MainActivity.kt
@@ -57,6 +57,7 @@ import com.theoplayer.android.connector.uplynk.network.AssetInfoResponse
 import com.theoplayer.android.connector.uplynk.network.PingResponse
 import com.theoplayer.android.connector.uplynk.network.PreplayLiveResponse
 import com.theoplayer.android.connector.uplynk.network.PreplayVodResponse
+import com.theoplayer.android.connector.yospace.YospaceConnector
 import com.theoplayer.android.ui.DefaultUI
 import com.theoplayer.android.ui.rememberPlayer
 import com.theoplayer.android.ui.theme.THEOplayerTheme
@@ -69,8 +70,7 @@ class MainActivity : ComponentActivity() {
     private lateinit var convivaConnector: ConvivaConnector
     private lateinit var nielsenConnector: NielsenConnector
     private lateinit var comscoreConnector: ComscoreConnector
-    // FIXME Re-enable Yospace connector
-    // private lateinit var yospaceConnector: YospaceConnector
+    private lateinit var yospaceConnector: YospaceConnector
     private lateinit var uplynkConnector: UplynkConnector
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -188,7 +188,7 @@ class MainActivity : ComponentActivity() {
     }
 
     private fun setupYospace() {
-        // yospaceConnector = YospaceConnector(theoplayerView)
+        yospaceConnector = YospaceConnector(theoplayerView)
     }
 
     private fun setupUplynk() {
diff --git a/app/src/main/java/com/theoplayer/android/connector/Sources.kt b/app/src/main/java/com/theoplayer/android/connector/Sources.kt
index 1e304642..4e8c78eb 100644
--- a/app/src/main/java/com/theoplayer/android/connector/Sources.kt
+++ b/app/src/main/java/com/theoplayer/android/connector/Sources.kt
@@ -13,6 +13,8 @@ import com.theoplayer.android.api.theolive.TheoLiveSource
 import com.theoplayer.android.connector.uplynk.UplynkAssetType
 import com.theoplayer.android.connector.uplynk.UplynkPingConfiguration
 import com.theoplayer.android.connector.uplynk.UplynkSsaiDescription
+import com.theoplayer.android.connector.yospace.YospaceSsaiDescription
+import com.theoplayer.android.connector.yospace.YospaceStreamType
 import java.util.Collections
 
 data class Source(
@@ -66,8 +68,6 @@ val sources: List<Source> by lazy {
                 .metadata(MetadataDescription(mutableMapOf("title" to "THEOlive demo")))
                 .build()
         ),
-        // FIXME Re-enable Yospace connector
-        /*
         Source(
             name = "Yospace HLS VOD",
             sourceDescription = SourceDescription
@@ -133,7 +133,6 @@ val sources: List<Source> by lazy {
                 )
                 .build()
         ),
-        */
         Source(
             name = "Uplynk Ads",
             sourceDescription = SourceDescription
diff --git a/build.gradle.kts b/build.gradle.kts
index 44b932cb..3c73c35f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -48,8 +48,7 @@ dependencies {
     dokka(project(":connectors:analytics:conviva"))
     dokka(project(":connectors:analytics:nielsen"))
     dokka(project(":connectors:mediasession"))
-    // FIXME Re-enable Yospace connector
-    // dokka(project(":connectors:yospace"))
+    dokka(project(":connectors:yospace"))
     dokka(project(":connectors:uplynk"))
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c1fb495b..31c15ad9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -34,6 +34,5 @@ include(":connectors:analytics:comscore")
 include(":connectors:analytics:conviva")
 include(":connectors:analytics:nielsen")
 include(":connectors:mediasession")
-// FIXME Re-enable Yospace connector after updating JFrog credentials
-// include(":connectors:yospace")
+include(":connectors:yospace")
 include(":connectors:uplynk")