diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d76ad2ca4..56caba40e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -23,6 +23,7 @@
 
 import com.google.devtools.ksp.KspExperimental
 import java.util.Properties
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
@@ -43,6 +44,19 @@ val lastCommitHash = providers.exec {
 
 kotlin {
     jvmToolchain(21)
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_21
+        freeCompilerArgs.addAll(
+            "-Xannotation-default-target=param-property"
+        )
+        optIn.addAll(
+            "androidx.compose.material3.ExperimentalMaterial3Api",
+            "androidx.compose.material3.ExperimentalMaterial3ExpressiveApi",
+            "androidx.compose.foundation.layout.ExperimentalLayoutApi",
+            "androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi",
+            "coil3.annotation.ExperimentalCoilApi"
+        )
+    }
 }
 
 android {
@@ -140,10 +154,6 @@ android {
         compose = true
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_21.toString()
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
diff --git a/app/src/main/java/com/aurora/store/compose/composables/CategoryComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/CategoryComposable.kt
index d619383fb..93b5b859c 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/CategoryComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/CategoryComposable.kt
@@ -21,7 +21,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.AsyncImage
 import coil3.compose.LocalAsyncImagePreviewHandler
 import coil3.request.ImageRequest
@@ -69,7 +68,6 @@ fun CategoryComposable(
 
 @Preview(showBackground = true)
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun CategoryComposablePreview() {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         CategoryComposable(category = Category(title = "Art & Design"))
diff --git a/app/src/main/java/com/aurora/store/compose/composables/DownloadComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/DownloadComposable.kt
index 49ba5261d..0174995a3 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/DownloadComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/DownloadComposable.kt
@@ -28,7 +28,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.AsyncImage
 import coil3.compose.LocalAsyncImagePreviewHandler
 import coil3.request.ImageRequest
@@ -119,7 +118,6 @@ fun DownloadComposable(
 
 @Preview(showBackground = true)
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun DownloadComposablePreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         DownloadComposable(download = Download.fromApp(app))
diff --git a/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt
index 5984a38ed..21292bdad 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt
@@ -31,7 +31,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.AsyncImage
 import coil3.compose.LocalAsyncImagePreviewHandler
 import coil3.request.ImageRequest
@@ -116,7 +115,6 @@ fun FavouriteComposable(
 
 @Preview(showBackground = true)
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun FavouriteComposablePreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         FavouriteComposable(favourite = Favourite.fromApp(app, Favourite.Mode.MANUAL))
diff --git a/app/src/main/java/com/aurora/store/compose/composables/ProgressComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/ProgressComposable.kt
index 589d9b279..e357677ee 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/ProgressComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/ProgressComposable.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.material3.ContainedLoadingIndicator
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -23,7 +22,6 @@ import com.aurora.store.R
  * @param modifier The modifier to be applied to the composable
  */
 @Composable
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 fun ProgressComposable(modifier: Modifier = Modifier) {
     Box(
         modifier = modifier
diff --git a/app/src/main/java/com/aurora/store/compose/composables/SearchAppBarComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/SearchAppBarComposable.kt
index 18e9722d7..d4b95ea75 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/SearchAppBarComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/SearchAppBarComposable.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
@@ -40,7 +39,6 @@ import com.aurora.store.R
  * @param actions Actions to display on the top app bar (for e.g. menu)
  */
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun SearchAppBarComposable(
     modifier: Modifier = Modifier,
     @StringRes searchHint: Int? = null,
diff --git a/app/src/main/java/com/aurora/store/compose/composables/TopAppBarComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/TopAppBarComposable.kt
index 66273445a..e81f755b3 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/TopAppBarComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/TopAppBarComposable.kt
@@ -6,7 +6,6 @@
 package com.aurora.store.compose.composables
 
 import androidx.compose.foundation.layout.RowScope
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
@@ -28,7 +27,6 @@ import com.aurora.store.R
  * @param actions Actions to display on the top app bar (for e.g. menu)
  */
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun TopAppBarComposable(
     modifier: Modifier = Modifier,
     title: String? = null,
diff --git a/app/src/main/java/com/aurora/store/compose/composables/app/AnimatedAppIconComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/app/AnimatedAppIconComposable.kt
index 5f8b2e286..f51bae3ea 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/app/AnimatedAppIconComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/app/AnimatedAppIconComposable.kt
@@ -26,7 +26,6 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.AsyncImage
 import coil3.compose.LocalAsyncImagePreviewHandler
 import coil3.request.ImageRequest
@@ -94,7 +93,6 @@ private class ProgressProvider: PreviewParameterProvider<Float> {
 
 @Preview(showBackground = true)
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun AnimatedAppIconPreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         AnimatedAppIconComposable(
@@ -106,7 +104,6 @@ private fun AnimatedAppIconPreview(@PreviewParameter(AppPreviewProvider::class)
 
 @Preview(showBackground = true)
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun AnimatedAppIconPreview(@PreviewParameter(ProgressProvider::class) progress: Float) {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         AnimatedAppIconComposable(
diff --git a/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt
index a296b584c..681cc1733 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt
@@ -24,7 +24,6 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.AsyncImage
 import coil3.compose.LocalAsyncImagePreviewHandler
 import coil3.request.ImageRequest
@@ -82,7 +81,6 @@ fun AppComposable(modifier: Modifier = Modifier, app: App, onClick: () -> Unit =
 
 @Preview(showBackground = true)
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun AppComposablePreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         AppComposable(app = app)
diff --git a/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt
index 53045fd70..9967f8191 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt
@@ -25,7 +25,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.AsyncImage
 import coil3.compose.LocalAsyncImagePreviewHandler
 import coil3.request.ImageRequest
@@ -87,7 +86,6 @@ fun AppListComposable(modifier: Modifier = Modifier, app: App, onClick: () -> Un
 
 @Preview(showBackground = true)
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 fun AppListComposablePreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         AppListComposable(app = app)
diff --git a/app/src/main/java/com/aurora/store/compose/composables/details/ReviewComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/details/ReviewComposable.kt
index 34f7a4772..3998006b7 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/details/ReviewComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/details/ReviewComposable.kt
@@ -26,7 +26,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.viewinterop.AndroidView
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.AsyncImage
 import coil3.compose.LocalAsyncImagePreviewHandler
 import coil3.request.ImageRequest
@@ -98,7 +97,6 @@ fun ReviewComposable(modifier: Modifier = Modifier, review: Review) {
 
 @Preview(showBackground = true)
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun ReviewComposablePreview(@PreviewParameter(ReviewPreviewProvider::class) review: Review) {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         ReviewComposable(review = review)
diff --git a/app/src/main/java/com/aurora/store/compose/composables/details/ScreenshotComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/details/ScreenshotComposable.kt
index b3408bb59..8913fd4b3 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/details/ScreenshotComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/details/ScreenshotComposable.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.AsyncImagePainter
 import coil3.compose.LocalAsyncImagePreviewHandler
 import coil3.compose.rememberAsyncImagePainter
@@ -62,7 +61,6 @@ fun ScreenshotComposable(modifier: Modifier = Modifier, url: String) {
 
 @Preview
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun ScreenshotComposablePreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         ScreenshotComposable(url = app.screenshots.firstOrNull()?.url ?: "")
diff --git a/app/src/main/java/com/aurora/store/compose/preview/Coil.kt b/app/src/main/java/com/aurora/store/compose/preview/Coil.kt
index 0adb597d6..a976ee99e 100644
--- a/app/src/main/java/com/aurora/store/compose/preview/Coil.kt
+++ b/app/src/main/java/com/aurora/store/compose/preview/Coil.kt
@@ -8,13 +8,11 @@ package com.aurora.store.compose.preview
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import coil3.ColorImage
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.AsyncImagePreviewHandler
 
 /**
  * Preview provider for composable working with coil for loading remote images
  */
-@OptIn(ExperimentalCoilApi::class)
 val coilPreviewProvider = AsyncImagePreviewHandler {
     ColorImage(Color.Gray.toArgb())
 }
diff --git a/app/src/main/java/com/aurora/store/compose/theme/Theme.kt b/app/src/main/java/com/aurora/store/compose/theme/Theme.kt
index 89d4a9cb0..e797d772f 100644
--- a/app/src/main/java/com/aurora/store/compose/theme/Theme.kt
+++ b/app/src/main/java/com/aurora/store/compose/theme/Theme.kt
@@ -7,7 +7,6 @@ package com.aurora.store.compose.theme
 
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialExpressiveTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
@@ -24,7 +23,6 @@ import com.aurora.store.util.Preferences
  * App theme for Aurora Store based on [MaterialTheme]
  */
 @Composable
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 fun AuroraTheme(content: @Composable () -> Unit) {
     val context = LocalContext.current
     val themeStyle = Preferences.getInteger(context, Preferences.PREFERENCE_THEME_STYLE)
diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt
index 6c6bf5c06..1074d8b16 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt
@@ -17,7 +17,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.layout.AnimatedPane
 import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
 import androidx.compose.material3.adaptive.layout.SupportingPaneScaffoldRole
@@ -39,7 +38,6 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.LocalAsyncImagePreviewHandler
 import com.aurora.Constants.PACKAGE_NAME_GMS
 import com.aurora.Constants.SHARE_URL
@@ -179,7 +177,6 @@ private fun ScreenContentError(onNavigateUp: () -> Unit = {}) {
  * Composable to display app details and suggestions
  */
 @Composable
-@OptIn(ExperimentalMaterial3AdaptiveApi::class)
 private fun ScreenContentApp(
     app: App,
     featuredReviews: List<Review> = emptyList(),
@@ -458,7 +455,6 @@ private fun ScreenContentApp(
 
 @PreviewScreenSizes
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun AppDetailsScreenPreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         ScreenContentApp(
diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsMoreScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsMoreScreen.kt
index 32b339bf1..f1f8390fc 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsMoreScreen.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsMoreScreen.kt
@@ -32,7 +32,6 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.window.core.layout.WindowWidthSizeClass
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.LocalAsyncImagePreviewHandler
 import com.aurora.extensions.adaptiveNavigationIcon
 import com.aurora.gplayapi.data.models.App
@@ -189,7 +188,6 @@ private fun AppInfoMore(app: App) {
 
 @Preview
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun DetailsMoreScreenPreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         ScreenContent(app = app)
diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsReviewScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsReviewScreen.kt
index 2f9b9b94b..9d3d95650 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsReviewScreen.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsReviewScreen.kt
@@ -38,7 +38,6 @@ import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
 import androidx.window.core.layout.WindowWidthSizeClass
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.LocalAsyncImagePreviewHandler
 import com.aurora.extensions.adaptiveNavigationIcon
 import com.aurora.gplayapi.data.models.Review
@@ -172,7 +171,6 @@ private fun FilterHeader(onClick: (filter: Review.Filter) -> Unit) {
 
 @Preview
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun DetailsReviewScreenPreview(@PreviewParameter(ReviewPreviewProvider::class) review: Review) {
     val reviews = List(10) { review.copy(commentId = Random.nextInt().toString()) }
     val reviewsFlow = MutableStateFlow(PagingData.from(reviews)).collectAsLazyPagingItems()
diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/components/AppDetails.kt b/app/src/main/java/com/aurora/store/compose/ui/details/components/AppDetails.kt
index d8697c0ad..93176cb24 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/details/components/AppDetails.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/details/components/AppDetails.kt
@@ -23,7 +23,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.LocalAsyncImagePreviewHandler
 import com.aurora.extensions.bodyVerySmall
 import com.aurora.gplayapi.data.models.App
@@ -95,7 +94,6 @@ fun AppDetails(
 
 @Preview(showBackground = true)
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun AppDetailsPreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) {
         CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/components/AppScreenshots.kt b/app/src/main/java/com/aurora/store/compose/ui/details/components/AppScreenshots.kt
index 8c7a70736..dade9cb88 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/details/components/AppScreenshots.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/details/components/AppScreenshots.kt
@@ -19,7 +19,6 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.LocalAsyncImagePreviewHandler
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.Artwork
@@ -51,7 +50,6 @@ fun AppScreenshots(screenshots: List<Artwork>, onNavigateToScreenshot: (index: I
 
 @Preview(showBackground = true)
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun AppScreenshotsPreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     Column(verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))) {
         CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
diff --git a/app/src/main/java/com/aurora/store/compose/ui/dev/DevProfileScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/dev/DevProfileScreen.kt
index 35ce81866..65eedfb25 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/dev/DevProfileScreen.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/dev/DevProfileScreen.kt
@@ -24,7 +24,6 @@ import androidx.paging.PagingData
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.LocalAsyncImagePreviewHandler
 import com.aurora.extensions.adaptiveNavigationIcon
 import com.aurora.gplayapi.data.models.App
@@ -128,7 +127,6 @@ private fun ScreenContent(
 
 @Preview
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun DevProfileScreenPreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     CompositionLocalProvider(LocalAsyncImagePreviewHandler provides coilPreviewProvider) {
         val apps = List(10) { app.copy(id = Random.nextInt()) }
diff --git a/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt
index 07b59c61d..88f012261 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt
@@ -9,14 +9,12 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.DockedSearchBar
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.layout.AnimatedPane
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
 import androidx.compose.material3.adaptive.navigation.NavigableListDetailPaneScaffold
@@ -45,7 +43,6 @@ import androidx.paging.PagingData
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.LocalAsyncImagePreviewHandler
 import com.aurora.gplayapi.SearchSuggestEntry
 import com.aurora.gplayapi.data.models.App
@@ -78,7 +75,6 @@ fun SearchScreen(onNavigateUp: () -> Unit, viewModel: SearchViewModel = hiltView
 }
 
 @Composable
-@OptIn(ExperimentalMaterial3AdaptiveApi::class, ExperimentalMaterial3Api::class)
 private fun ScreenContent(
     suggestions: List<SearchSuggestEntry> = emptyList(),
     results: LazyPagingItems<App> = flowOf(PagingData.empty<App>()).collectAsLazyPagingItems(),
@@ -238,7 +234,6 @@ private fun ScreenContent(
 
 @PreviewScreenSizes
 @Composable
-@OptIn(ExperimentalCoilApi::class)
 private fun SearchScreenPreview(@PreviewParameter(AppPreviewProvider::class) app: App) {
     val apps = List(10) { app.copy(id = Random.nextInt()) }
     val results = flowOf(PagingData.from(apps)).collectAsLazyPagingItems()