diff --git a/api/build.gradle b/api/build.gradle
index 28a4906a..3b258810 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -12,9 +12,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    lintOptions {
-        abortOnError false
-    }
 
     sourceSets {
         androidTest.assets.srcDirs += files("$projectDir/androidTest/assets".toString())
@@ -39,6 +36,10 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    lint {
+        abortOnError false
+    }
+    namespace 'com.readrops.api'
 }
 
 dependencies {
diff --git a/api/src/debug/AndroidManifest.xml b/api/src/debug/AndroidManifest.xml
index bc80eafd..dd871fc0 100644
--- a/api/src/debug/AndroidManifest.xml
+++ b/api/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.readrops.api">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- for tests only -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/api/src/main/AndroidManifest.xml b/api/src/main/AndroidManifest.xml
index b1075664..0a0938ae 100644
--- a/api/src/main/AndroidManifest.xml
+++ b/api/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.readrops.api">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/app/build.gradle b/app/build.gradle
index 48914c02..247458e6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,9 +18,6 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
-    lintOptions {
-        abortOnError false
-    }
     buildTypes {
         release {
             minifyEnabled true
@@ -52,6 +49,10 @@ android {
         viewBinding true
         buildConfig true
     }
+    lint {
+        abortOnError false
+    }
+    namespace 'com.readrops.app'
 }
 
 dependencies {
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index a1d2a946..548b2db7 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.readrops.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".ReadropsDebugApp"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aca83851..6301624c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.readrops.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/build.gradle b/build.gradle
index 2c6de9af..63ed0d02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.30'
+    ext.kotlin_version = '1.8.0'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jacoco:org.jacoco.core:0.8.7"
     }
diff --git a/db/build.gradle b/db/build.gradle
index 646e0ba2..41690dc2 100644
--- a/db/build.gradle
+++ b/db/build.gradle
@@ -28,9 +28,6 @@ android {
         androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
-    lintOptions {
-        abortOnError false
-    }
 
     buildTypes {
         release {
@@ -52,6 +49,10 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    lint {
+        abortOnError false
+    }
+    namespace 'com.readrops.db'
 }
 
 // Needed for kapt starting with kotlin plugin 1.5
diff --git a/db/src/main/AndroidManifest.xml b/db/src/main/AndroidManifest.xml
index aa1258a6..94cbbcfc 100644
--- a/db/src/main/AndroidManifest.xml
+++ b/db/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.readrops.db" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/db/src/main/java/com/readrops/db/Converters.kt b/db/src/main/java/com/readrops/db/Converters.kt
index 5291deeb..91b64589 100644
--- a/db/src/main/java/com/readrops/db/Converters.kt
+++ b/db/src/main/java/com/readrops/db/Converters.kt
@@ -4,7 +4,7 @@ import androidx.room.TypeConverter
 import com.readrops.db.entities.account.AccountType
 import org.joda.time.LocalDateTime
 
-object Converters {
+class Converters {
 
     @TypeConverter
     fun fromTimeStamp(value: Long): LocalDateTime {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0d90a675..7bd21ed8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip