diff --git a/.idea/runConfigurations/Katana_Android.xml b/.idea/runConfigurations/Katana_Android.xml
index 38ed8d7a7..3e1b523b9 100644
--- a/.idea/runConfigurations/Katana_Android.xml
+++ b/.idea/runConfigurations/Katana_Android.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Katana Android" type="AndroidRunConfigurationType" factoryName="Android App" singleton="true">
+  <configuration default="false" name="Katana Android" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false" singleton="true">
     <module name="Katana.app-android.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
diff --git a/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/KatanaConfiguration.kt b/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/KatanaConfiguration.kt
index 3b4dd7d60..157b4860c 100644
--- a/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/KatanaConfiguration.kt
+++ b/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/KatanaConfiguration.kt
@@ -13,7 +13,7 @@ internal object KatanaConfiguration {
     const val VersionName = "0.0.1"
     const val VersionCode = 1
 
-    val UseJavaVersion = JavaVersion.VERSION_11
+    val UseJavaVersion = JavaVersion.VERSION_17
     val JvmTarget = KtJvmTarget.fromTarget(UseJavaVersion.toString())
     val JvmTargetStr = JvmTarget.target
     val KotlinVersion = KtVersion.KOTLIN_1_9
diff --git a/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/data/KatanaMultiplatformDataRemotePlugin.kt b/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/data/KatanaMultiplatformDataRemotePlugin.kt
index ae366319e..190c68dbd 100644
--- a/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/data/KatanaMultiplatformDataRemotePlugin.kt
+++ b/build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/data/KatanaMultiplatformDataRemotePlugin.kt
@@ -58,23 +58,24 @@ internal class KatanaMultiplatformDataRemotePlugin : Plugin<Project> {
     private fun ApolloExtension.configureApollo() {
         service("anilist") {
             generateAsInternal.set(true)
-            generateDataBuilders.set(true)
             packageName.set(fullPackageName)
 
-            if (fullPackageName.contains(BASE_PACKAGE)) {
-                alwaysGenerateTypesMatching.set(listOf("Query", "User"))
+            if (path == CORE_PROJECT) {
                 generateApolloMetadata.set(true)
                 generateAsInternal.set(false)
+                generateDataBuilders.set(true)
 
                 introspection {
                     endpointUrl.set("https://graphql.anilist.co")
                     schemaFile.set(project.file("src/commonMain/graphql/schema.graphqls"))
                 }
+            } else {
+                dependsOn(project(CORE_PROJECT))
             }
         }
     }
 
     private companion object {
-        const val BASE_PACKAGE = ".remote"
+        const val CORE_PROJECT = ":core:remote"
     }
 }
diff --git a/common/user/data/build.gradle.kts b/common/user/data/build.gradle.kts
index 8c1e3c3aa..6f63c99ff 100644
--- a/common/user/data/build.gradle.kts
+++ b/common/user/data/build.gradle.kts
@@ -2,10 +2,6 @@ plugins {
     id("katana.multiplatform.data.remote")
 }
 
-dependencies {
-    apolloMetadata(projects.core.remote)
-}
-
 katanaMultiplatform {
     commonMainDependencies {
         implementation(projects.core.common)
diff --git a/core/remote/src/commonMain/graphql/schema.graphqls b/core/remote/src/commonMain/graphql/schema.graphqls
index 4f0e31e88..4d497e69d 100644
--- a/core/remote/src/commonMain/graphql/schema.graphqls
+++ b/core/remote/src/commonMain/graphql/schema.graphqls
@@ -129,12 +129,6 @@ type Query {
   ExternalLinkSourceCollection("Filter by the link id" id: Int, type: ExternalLinkType, mediaType: ExternalLinkMediaType): [MediaExternalLink]
 }
 
-"""
-The `Int` scalar type represents non-fractional signed whole numeric
-values. Int can represent values between -(2^31) and 2^31 - 1. 
-"""
-scalar Int
-
 """
 Page of data
 """
@@ -208,18 +202,6 @@ type PageInfo {
   hasNextPage: Boolean
 }
 
-"""
-The `Boolean` scalar type represents `true` or `false`.
-"""
-scalar Boolean
-
-"""
-The `String` scalar type represents textual data, represented as UTF-8
-character sequences. The String type is most often used by GraphQL to
-represent free-form human-readable text.
-"""
-scalar String
-
 """
 User sort enums
 """
@@ -2579,13 +2561,6 @@ type MediaList {
   user: User
 }
 
-"""
-The `Float` scalar type represents signed double-precision fractional
-values as specified by
-[IEEE 754](http://en.wikipedia.org/wiki/IEEE_floating_point). 
-"""
-scalar Float
-
 """
 Review sort enums
 """
@@ -3516,6 +3491,9 @@ enum AiringSort {
   EPISODE_DESC
 }
 
+"""
+Notification union type
+"""
 union NotificationUnion = AiringNotification|FollowingNotification|ActivityMessageNotification|ActivityMentionNotification|ActivityReplyNotification|ActivityReplySubscribedNotification|ActivityLikeNotification|ActivityReplyLikeNotification|ThreadCommentMentionNotification|ThreadCommentReplyNotification|ThreadCommentSubscribedNotification|ThreadCommentLikeNotification|ThreadLikeNotification|RelatedMediaAdditionNotification|MediaDataChangeNotification|MediaMergeNotification|MediaDeletionNotification
 
 """
@@ -3853,6 +3831,9 @@ type ActivityMentionNotification {
   user: User
 }
 
+"""
+Activity union type
+"""
 union ActivityUnion = TextActivity|ListActivity|MessageActivity
 
 """
@@ -5252,6 +5233,9 @@ type Deleted {
   deleted: Boolean
 }
 
+"""
+Likeable union type
+"""
 union LikeableUnion = ListActivity|TextActivity|MessageActivity|ActivityReply|Thread|ThreadComment
 
 input AniChartHighlightInput {
@@ -5863,15 +5847,8 @@ type UserModData {
   email: String
 }
 
-"""
-The `ID` scalar type represents a unique identifier, often used to
-refetch an object or as key for a cache. The ID type appears in a JSON
-response as a String; however, it is not intended to be human-readable.
-When expected as an input type, any string (such as `"4"`) or integer
-(such as `4`) input value will be accepted as an ID.
-"""
-scalar ID
-
+# See https://github.com/JetBrains/js-graphql-intellij-plugin/issues/665
+# noinspection GraphQLTypeRedefinition
 """
 A GraphQL Schema defines the capabilities of a GraphQL server. It exposes all available types and directives on the server, as well as the entry points for query, mutation, and subscription operations.
 """
@@ -5902,6 +5879,8 @@ type __Schema {
   directives: [__Directive!]!
 }
 
+# See https://github.com/JetBrains/js-graphql-intellij-plugin/issues/665
+# noinspection GraphQLTypeRedefinition
 """
 The fundamental unit of any GraphQL Schema is the type. There are many kinds of types in GraphQL as represented by the `__TypeKind` enum.
 
@@ -5927,6 +5906,8 @@ type __Type {
   ofType: __Type
 }
 
+# See https://github.com/JetBrains/js-graphql-intellij-plugin/issues/665
+# noinspection GraphQLTypeRedefinition
 """
 An enum describing what kind of type a given `__Type` is.
 """
@@ -5972,6 +5953,8 @@ enum __TypeKind {
   NON_NULL
 }
 
+# See https://github.com/JetBrains/js-graphql-intellij-plugin/issues/665
+# noinspection GraphQLTypeRedefinition
 """
 Object and Interface types are described by a list of Fields, each of which has a name, potentially a list of arguments, and a return type.
 """
@@ -5989,6 +5972,8 @@ type __Field {
   deprecationReason: String
 }
 
+# See https://github.com/JetBrains/js-graphql-intellij-plugin/issues/665
+# noinspection GraphQLTypeRedefinition
 """
 Arguments provided to Fields or Directives and the input fields of an InputObject are represented as Input Values which describe their type and optionally a default value.
 """
@@ -6005,6 +5990,8 @@ type __InputValue {
   defaultValue: String
 }
 
+# See https://github.com/JetBrains/js-graphql-intellij-plugin/issues/665
+# noinspection GraphQLTypeRedefinition
 """
 One possible value for a given Enum. Enum values are unique values, not a placeholder for a string or numeric value. However an Enum value is returned in a JSON response as a string.
 """
@@ -6018,6 +6005,8 @@ type __EnumValue {
   deprecationReason: String
 }
 
+# See https://github.com/JetBrains/js-graphql-intellij-plugin/issues/665
+# noinspection GraphQLTypeRedefinition
 """
 A Directive provides a way to describe alternate runtime execution and type validation behavior in a GraphQL document.
 
@@ -6039,6 +6028,8 @@ type __Directive {
   onField: Boolean! @deprecated(reason: "Use `locations`.")
 }
 
+# See https://github.com/JetBrains/js-graphql-intellij-plugin/issues/665
+# noinspection GraphQLTypeRedefinition
 """
 A Directive can be adjacent to many parts of the GraphQL language, a __DirectiveLocation describes one such possible adjacencies.
 """
@@ -6134,16 +6125,22 @@ enum __DirectiveLocation {
   INPUT_FIELD_DEFINITION
 }
 
+# See https://github.com/JetBrains/js-graphql-intellij-plugin/issues/665
+# noinspection GraphQLTypeRedefinition
 """
 Directs the executor to include this field or fragment only when the `if` argument is true.
 """
 directive @include ("Included when true." if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
 
+# See https://github.com/JetBrains/js-graphql-intellij-plugin/issues/665
+# noinspection GraphQLTypeRedefinition
 """
 Directs the executor to skip this field or fragment when the `if` argument is true.
 """
 directive @skip ("Skipped when true." if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
 
+# See https://github.com/JetBrains/js-graphql-intellij-plugin/issues/665
+# noinspection GraphQLTypeRedefinition
 """
 Marks an element of a GraphQL schema as no longer supported.
 """
diff --git a/features/account/data/build.gradle.kts b/features/account/data/build.gradle.kts
index 93e1fdd9c..ca626a75f 100644
--- a/features/account/data/build.gradle.kts
+++ b/features/account/data/build.gradle.kts
@@ -2,10 +2,6 @@ plugins {
     id("katana.multiplatform.data.remote")
 }
 
-dependencies {
-    apolloMetadata(projects.core.remote)
-}
-
 katanaMultiplatform {
     commonMainDependencies {
         implementation(projects.core.remote)
diff --git a/features/explore/data/build.gradle.kts b/features/explore/data/build.gradle.kts
index 67d16b735..f9804cbde 100644
--- a/features/explore/data/build.gradle.kts
+++ b/features/explore/data/build.gradle.kts
@@ -2,10 +2,6 @@ plugins {
     id("katana.multiplatform.data.remote")
 }
 
-dependencies {
-    apolloMetadata(projects.core.remote)
-}
-
 katanaMultiplatform {
     commonMainDependencies {
         implementation(projects.core.remote)
diff --git a/features/lists/data/build.gradle.kts b/features/lists/data/build.gradle.kts
index d93813613..e16797cf1 100644
--- a/features/lists/data/build.gradle.kts
+++ b/features/lists/data/build.gradle.kts
@@ -2,10 +2,6 @@ plugins {
     id("katana.multiplatform.data.remote")
 }
 
-dependencies {
-    apolloMetadata(projects.core.remote)
-}
-
 katanaMultiplatform {
     commonMainDependencies {
         implementation(projects.common.user.domain)
diff --git a/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/MediaEntryMapperTest.kt b/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/MediaEntryMapperTest.kt
index 4b602939c..c3b3bd0b4 100644
--- a/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/MediaEntryMapperTest.kt
+++ b/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/MediaEntryMapperTest.kt
@@ -9,7 +9,7 @@ import io.kotest.matchers.shouldNotBe
 import dev.alvr.katana.features.lists.data.fragment.MediaEntry as MediaEntryFragment
 
 internal class MediaEntryMapperTest : FreeSpec({
-    MediaFormat.knownValues()
+    MediaFormat.knownEntries
         .forEach { format ->
             "MediaFormat $format should not be ${CommonMediaEntry.Format.UNKNOWN}" {
                 MediaEntryFragment(
diff --git a/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/mocks.kt b/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/mocks.kt
index 3a6c764d7..05da7f71e 100644
--- a/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/mocks.kt
+++ b/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/mocks.kt
@@ -49,13 +49,7 @@ internal val mediaListMock = MediaList(
     updatedAt = Arb.dateTimeTz().orNull().next(),
 )
 
-internal val apolloErrorMock = Error(
-    message = Arb.string().next(),
-    locations = emptyList(),
-    path = emptyList(),
-    extensions = emptyMap(),
-    nonStandardFields = emptyMap(),
-)
+internal val apolloErrorMock = Error.Builder(Arb.string().next()).build()
 
 private fun Arb.Companion.date() = arbitrary {
     Date(
diff --git a/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/sources/CommonListsRemoteSourceTest.kt b/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/sources/CommonListsRemoteSourceTest.kt
index f10f165c3..063d26fe4 100644
--- a/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/sources/CommonListsRemoteSourceTest.kt
+++ b/features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/sources/CommonListsRemoteSourceTest.kt
@@ -49,8 +49,7 @@ internal class CommonListsRemoteSourceTest : FreeSpec() {
                     val response = ApolloResponse.Builder(
                         operation = mediaListCollectionQueryMock,
                         requestUuid = uuid4(),
-                        data = data,
-                    ).build()
+                    ).data(data).build()
                     client.enqueueTestResponse(response)
 
                     source.getMediaCollection<MediaEntry>(type).test(5.seconds) {
@@ -65,8 +64,7 @@ internal class CommonListsRemoteSourceTest : FreeSpec() {
                     val response = ApolloResponse.Builder(
                         operation = mediaListCollectionQueryMock,
                         requestUuid = uuid4(),
-                        data = data,
-                    ).errors(listOf(apolloErrorMock)).build()
+                    ).data(data).errors(listOf(apolloErrorMock)).build()
                     client.enqueueTestResponse(response)
 
                     source.getMediaCollection<MediaEntry>(type).test(5.seconds) {
@@ -94,7 +92,7 @@ internal class CommonListsRemoteSourceTest : FreeSpec() {
                 reloadInterceptor,
             )
 
-            afterSpec { mockServer.stop() }
+            afterSpec { mockServer.close() }
 
             badClient().forEach { (type, action) ->
                 "a HTTP error occurs" {
@@ -123,7 +121,7 @@ internal class CommonListsRemoteSourceTest : FreeSpec() {
             add(null)
             add(empty)
         }
-        val types = MediaType.knownValues()
+        val types = MediaType.knownEntries
 
         return buildList {
             values.forEach { v -> types.forEach { t -> add(v to t) } }
@@ -140,7 +138,7 @@ internal class CommonListsRemoteSourceTest : FreeSpec() {
             add(apolloCommand { body("Malformed body") })
             add(apolloCommand { body("""{"data": {"random": 42}}""") })
         }
-        val types = MediaType.knownValues()
+        val types = MediaType.knownEntries
 
         return buildList {
             commands.forEach { c -> types.forEach { t -> add(t to c) } }
diff --git a/features/social/data/build.gradle.kts b/features/social/data/build.gradle.kts
index 881f2c4b3..dd81aed27 100644
--- a/features/social/data/build.gradle.kts
+++ b/features/social/data/build.gradle.kts
@@ -2,10 +2,6 @@ plugins {
     id("katana.multiplatform.data.remote")
 }
 
-dependencies {
-    apolloMetadata(projects.core.remote)
-}
-
 katanaMultiplatform {
     commonMainDependencies {
         implementation(projects.core.remote)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 220eb326b..9c34f7189 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ android = "8.3.1"
 androidx-activity = "1.8.2"
 androidx-lifecycle = "2.7.0"
 androidx-splashscreen = "1.0.1"
-apollo = "3.8.2"
+apollo = "4.0.0-beta.5"
 arrow = "1.2.3"
 buildconfig = "5.3.5"
 complete-kotlin = "1.1.0"