diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bbe15182..9a86d2e3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -2,7 +2,7 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
+@file:Suppress("UnstableApiUsage")
 
 plugins {
   id("com.github.android-password-store.android-application")
diff --git a/autofill-parser/build.gradle.kts b/autofill-parser/build.gradle.kts
index a77694a0..844b7f3b 100644
--- a/autofill-parser/build.gradle.kts
+++ b/autofill-parser/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
   id("com.github.android-password-store.published-android-library")
   id("com.github.android-password-store.kotlin-android")
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index b138fa94..6c1f970b 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 import org.gradle.api.JavaVersion
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.kotlin.dsl.withType
diff --git a/build.gradle.kts b/build.gradle.kts
index d82224e0..450f9faa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
   id("com.github.android-password-store.git-hooks")
   id("com.github.android-password-store.kotlin-common")
diff --git a/coroutine-utils-testing/build.gradle.kts b/coroutine-utils-testing/build.gradle.kts
index 62ff4eeb..96d87dc1 100644
--- a/coroutine-utils-testing/build.gradle.kts
+++ b/coroutine-utils-testing/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
   kotlin("jvm")
   id("com.github.android-password-store.kotlin-library")
diff --git a/coroutine-utils/build.gradle.kts b/coroutine-utils/build.gradle.kts
index 3daf5f4f..78f1e8c2 100644
--- a/coroutine-utils/build.gradle.kts
+++ b/coroutine-utils/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
   kotlin("jvm")
   id("com.github.android-password-store.kotlin-library")
diff --git a/crypto-common/build.gradle.kts b/crypto-common/build.gradle.kts
index d05c1ad1..b644cddd 100644
--- a/crypto-common/build.gradle.kts
+++ b/crypto-common/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
   kotlin("jvm")
   id("com.github.android-password-store.kotlin-library")
diff --git a/crypto-pgpainless/build.gradle.kts b/crypto-pgpainless/build.gradle.kts
index 56c0c762..ba7dac75 100644
--- a/crypto-pgpainless/build.gradle.kts
+++ b/crypto-pgpainless/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
   kotlin("jvm")
   id("com.github.android-password-store.kotlin-library")
diff --git a/format-common/build.gradle.kts b/format-common/build.gradle.kts
index 8382436c..f20c56b6 100644
--- a/format-common/build.gradle.kts
+++ b/format-common/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
   kotlin("jvm")
   id("com.github.android-password-store.kotlin-library")
diff --git a/openpgp-ktx/build.gradle.kts b/openpgp-ktx/build.gradle.kts
index e68f8ecd..e9b574ef 100644
--- a/openpgp-ktx/build.gradle.kts
+++ b/openpgp-ktx/build.gradle.kts
@@ -2,7 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-
 plugins {
   id("com.github.android-password-store.published-android-library")
   id("com.github.android-password-store.kotlin-android")
diff --git a/passgen/diceware/build.gradle.kts b/passgen/diceware/build.gradle.kts
index 5a7ce8c1..81db24cc 100644
--- a/passgen/diceware/build.gradle.kts
+++ b/passgen/diceware/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
   id("com.github.android-password-store.android-library")
   id("com.github.android-password-store.kotlin-android")
diff --git a/passgen/random/build.gradle.kts b/passgen/random/build.gradle.kts
index ea598259..0f48bceb 100644
--- a/passgen/random/build.gradle.kts
+++ b/passgen/random/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
   kotlin("jvm")
   id("com.github.android-password-store.kotlin-library")
diff --git a/sentry-stub/build.gradle.kts b/sentry-stub/build.gradle.kts
index ea598259..0f48bceb 100644
--- a/sentry-stub/build.gradle.kts
+++ b/sentry-stub/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
   kotlin("jvm")
   id("com.github.android-password-store.kotlin-library")
diff --git a/ui-compose/build.gradle.kts b/ui-compose/build.gradle.kts
index c8c96a4e..e8abfeb8 100644
--- a/ui-compose/build.gradle.kts
+++ b/ui-compose/build.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
   id("com.github.android-password-store.android-library")
   id("com.github.android-password-store.kotlin-android")