diff --git a/.github/workflows/android_tests_aer.yml b/.github/workflows/android_tests_aer.yml
index 23cd0a8f1..94b6a4c19 100644
--- a/.github/workflows/android_tests_aer.yml
+++ b/.github/workflows/android_tests_aer.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Setup Android SDK
@@ -72,7 +72,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Setup Android SDK
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 450cc64fe..38f4ac9e0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Build with Gradle
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1f70a810a..0492c4fe5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Build with Gradle
@@ -67,7 +67,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Build with Gradle
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index dd402c2ad..d97d6b595 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -26,3 +26,5 @@
 }
 
 -keepnames class * implements android.os.Parcelable*
+
+-dontwarn javax.servlet.ServletContainerInitializer
diff --git a/app/src/androidTest/java/com/escodro/alkaa/NotificationFlowTest.kt b/app/src/androidTest/java/com/escodro/alkaa/NotificationFlowTest.kt
index 47a4b31b0..6238e435d 100644
--- a/app/src/androidTest/java/com/escodro/alkaa/NotificationFlowTest.kt
+++ b/app/src/androidTest/java/com/escodro/alkaa/NotificationFlowTest.kt
@@ -16,7 +16,6 @@ import com.escodro.domain.usecase.alarm.ScheduleAlarm
 import com.escodro.local.model.AlarmInterval
 import com.escodro.local.model.Task
 import com.escodro.local.provider.DaoProvider
-import com.escodro.task.R
 import com.escodro.test.rule.DisableAnimationsRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
@@ -30,6 +29,7 @@ import java.util.Calendar
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import com.escodro.alarm.R as AlarmR
+import com.escodro.designsystem.R as DesignSystemR
 
 @OptIn(ExperimentalCoroutinesApi::class, ExperimentalTestApi::class)
 internal class NotificationFlowTest : KoinTest {
@@ -102,7 +102,10 @@ internal class NotificationFlowTest : KoinTest {
         // Validate the task detail was opened
         composeTestRule.onNodeWithText(name).assertIsDisplayed()
         composeTestRule
-            .onNodeWithContentDescription(string(R.string.back_arrow_cd), useUnmergedTree = true)
+            .onNodeWithContentDescription(
+                string(DesignSystemR.string.back_arrow_cd),
+                useUnmergedTree = true,
+            )
             .assertIsDisplayed()
     }
 
diff --git a/app/src/androidTest/java/com/escodro/alkaa/TaskFlowTest.kt b/app/src/androidTest/java/com/escodro/alkaa/TaskFlowTest.kt
index a0b6740b8..ccffb3aaf 100644
--- a/app/src/androidTest/java/com/escodro/alkaa/TaskFlowTest.kt
+++ b/app/src/androidTest/java/com/escodro/alkaa/TaskFlowTest.kt
@@ -32,6 +32,7 @@ import org.koin.test.KoinTest
 import org.koin.test.inject
 import org.koin.test.mock.declare
 import java.util.Calendar
+import com.escodro.designsystem.R as DesignSystemR
 import com.escodro.task.R as TaskR
 
 @OptIn(ExperimentalCoroutinesApi::class, ExperimentalTestApi::class)
@@ -191,7 +192,7 @@ internal class TaskFlowTest : KoinTest {
 
     private fun pressBack() {
         composeTestRule.onNodeWithContentDescription(
-            string(TaskR.string.back_arrow_cd),
+            string(DesignSystemR.string.back_arrow_cd),
             useUnmergedTree = true,
         ).performClick()
 
diff --git a/libraries/core/src/main/res/values/colors.xml b/data/local/src/main/res/values/colors.xml
similarity index 100%
rename from libraries/core/src/main/res/values/colors.xml
rename to data/local/src/main/res/values/colors.xml
diff --git a/features/alarm/src/main/java/com/escodro/alarm/notification/TaskNotification.kt b/features/alarm/src/main/java/com/escodro/alarm/notification/TaskNotification.kt
index 0d83918bc..a66c768fa 100644
--- a/features/alarm/src/main/java/com/escodro/alarm/notification/TaskNotification.kt
+++ b/features/alarm/src/main/java/com/escodro/alarm/notification/TaskNotification.kt
@@ -68,7 +68,7 @@ internal class TaskNotification(
     private fun buildNotification(task: Task) =
         NotificationCompat.Builder(context, channel.getChannelId()).apply {
             setSmallIcon(R.drawable.ic_bookmark_check)
-            setContentTitle(context.getString(R.string.app_name))
+            setContentTitle(context.getString(R.string.content_app_name))
             setContentText(task.title)
             setContentIntent(buildPendingIntent(task))
             setAutoCancel(true)
diff --git a/features/alarm/src/main/java/com/escodro/alarm/permission/AndroidVersionImpl.kt b/features/alarm/src/main/java/com/escodro/alarm/permission/AndroidVersionImpl.kt
index ad892837a..2110e733f 100644
--- a/features/alarm/src/main/java/com/escodro/alarm/permission/AndroidVersionImpl.kt
+++ b/features/alarm/src/main/java/com/escodro/alarm/permission/AndroidVersionImpl.kt
@@ -1,8 +1,10 @@
 package com.escodro.alarm.permission
 
 import android.os.Build
+import androidx.annotation.ChecksSdkIntAtLeast
 
 internal class AndroidVersionImpl : AndroidVersion {
 
+    @ChecksSdkIntAtLeast(extension = Build.VERSION_CODES.N)
     override val currentVersion: Int = Build.VERSION.SDK_INT
 }
diff --git a/features/alarm/src/main/res/values/strings.xml b/features/alarm/src/main/res/values/strings.xml
index cb97e68ee..e029c5e98 100644
--- a/features/alarm/src/main/res/values/strings.xml
+++ b/features/alarm/src/main/res/values/strings.xml
@@ -1,4 +1,7 @@
 <resources>
+    <!-- Notification app name -->
+    <string name="content_app_name" translatable="false">Alkaa</string>
+
     <!-- Task notification channel -->
     <string name="channel_task_name">Task alarms</string>
     <string name="channel_task_description">Notifications for reminders</string>
diff --git a/features/preference/src/androidTest/java/com/escodro/preference/AboutTest.kt b/features/preference/src/androidTest/java/com/escodro/preference/AboutTest.kt
index cdfc9f51f..aec98056d 100644
--- a/features/preference/src/androidTest/java/com/escodro/preference/AboutTest.kt
+++ b/features/preference/src/androidTest/java/com/escodro/preference/AboutTest.kt
@@ -21,7 +21,7 @@ internal class AboutTest {
         loadView()
 
         // Then the items are shown
-        val appName = context.getString(R.string.app_name)
+        val appName = context.getString(R.string.about_title)
         val description = context.getString(R.string.about_description)
         val button = context.getString(R.string.about_button_project)
         composeTestRule.onNodeWithText(text = appName, ignoreCase = true).assertExists()
diff --git a/features/preference/src/main/java/com/escodro/preference/presentation/About.kt b/features/preference/src/main/java/com/escodro/preference/presentation/About.kt
index b035e678b..3cad68752 100644
--- a/features/preference/src/main/java/com/escodro/preference/presentation/About.kt
+++ b/features/preference/src/main/java/com/escodro/preference/presentation/About.kt
@@ -85,7 +85,7 @@ private fun ContentHeader() {
             .height(200.dp)
             .background(color = color),
     ) {
-        val appName = stringResource(id = R.string.app_name).lowercase(Locale.getDefault())
+        val appName = stringResource(id = R.string.about_title).lowercase(Locale.getDefault())
         Text(
             text = appName,
             style = MaterialTheme.typography.displayLarge.copy(
diff --git a/features/preference/src/main/res/values/strings.xml b/features/preference/src/main/res/values/strings.xml
index fb6c829e4..27719efaf 100644
--- a/features/preference/src/main/res/values/strings.xml
+++ b/features/preference/src/main/res/values/strings.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="preference_title_about">About</string>
     <string name="preference_title_version">Version</string>
     <string name="preference_title_tracker">Task Tracker</string>
 
+    <string name="about_title" translatable="false">Alkaa</string>
     <string name="about_description">Alkaa (to begin, to start in Finnish) is a simple to-do list to make your life easier.\n\nIt all started when I created a project to learn and keep me updated about the latest Android components and libraries. And now it is available on it Jetpack Compose version! If you\'re a developer or an enthusiast feel free to access, copy and updated the open-source code.\n\nThanks a lot for using my app! </string>
     <string name="about_button_project">Visit project on GitHub</string>
     <string name="about_cd_github" translatable="false">GitHub</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5b904b83e..c7e0e1d77 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # Project
-android_gradle_plugin = "7.4.2"
+android_gradle_plugin = "8.0.0"
 kotlin = "1.8.10"
 
 # Plugins
diff --git a/plugins/src/main/java/AlkaaVersions.kt b/plugins/src/main/java/AlkaaVersions.kt
index b30e54195..379a4f1a7 100644
--- a/plugins/src/main/java/AlkaaVersions.kt
+++ b/plugins/src/main/java/AlkaaVersions.kt
@@ -12,6 +12,6 @@ object AlkaaVersions {
     const val compileSdk = 33
     const val targetSdk = 33
     const val minSdk = 24
-    val javaCompileVersion = JavaVersion.VERSION_11
-    val javaLanguageVersion: JavaLanguageVersion = JavaLanguageVersion.of(11)
+    val javaCompileVersion = JavaVersion.VERSION_17
+    val javaLanguageVersion: JavaLanguageVersion = JavaLanguageVersion.of(17)
 }
diff --git a/plugins/src/main/java/com.escodro.android-library.gradle.kts b/plugins/src/main/java/com.escodro.android-library.gradle.kts
index cd00d9c5b..476b9a09c 100644
--- a/plugins/src/main/java/com.escodro.android-library.gradle.kts
+++ b/plugins/src/main/java/com.escodro.android-library.gradle.kts
@@ -13,7 +13,7 @@ android {
     androidConfig()
     proguardConfig()
     kotlin {
-        jvmToolchain(JavaLanguageVersion.of(11).asInt())
+        jvmToolchain(AlkaaVersions.javaLanguageVersion.asInt())
     }
 }