diff --git a/overlay/CertifiedPropOverlay/Android.bp b/overlay/CertifiedPropOverlay/Android.bp
index 621f6ec..17f63b4 100644
--- a/overlay/CertifiedPropOverlay/Android.bp
+++ b/overlay/CertifiedPropOverlay/Android.bp
@@ -1,24 +1,5 @@
-//
-// Copyright (c) 2020,2022 The LineageOS Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
 runtime_resource_overlay {
     name: "CertifiedPropOverlay",
+    sdk_version: "current",
     system_ext_specific: true,
 }
diff --git a/overlay/CertifiedPropOverlay/AndroidManifest.xml b/overlay/CertifiedPropOverlay/AndroidManifest.xml
index dc4ba2b..82b3e3d 100644
--- a/overlay/CertifiedPropOverlay/AndroidManifest.xml
+++ b/overlay/CertifiedPropOverlay/AndroidManifest.xml
@@ -1,20 +1,10 @@
-<!--
-    Copyright (c) 2020, The LineageOS Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.certified.props.overlay">
-    <application android:hasCode="false"/>
-    <overlay android:targetPackage="android"/>
+
+    <application android:hasCode="false" />
+    <overlay
+        android:isStatic="true"
+        android:priority="1"
+        android:targetName="CertifiedPropOverlay"
+        android:targetPackage="android" />
 </manifest>
\ No newline at end of file
diff --git a/overlay/fonts/FontWenkaiOverlay/Android.bp b/overlay/fonts/FontWenkaiOverlay/Android.bp
index 149bc71..ecb4a8b 100644
--- a/overlay/fonts/FontWenkaiOverlay/Android.bp
+++ b/overlay/fonts/FontWenkaiOverlay/Android.bp
@@ -1,25 +1,7 @@
-//
-// Copyright (c) 2020,2022 The LineageOS Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
 
 runtime_resource_overlay {
     name: "FontWenkaiOverlay",
     theme: "FontWenkai",
+    sdk_version: "current",
     product_specific: true,
 }
diff --git a/overlay/fonts/FontWenkaiOverlay/AndroidManifest.xml b/overlay/fonts/FontWenkaiOverlay/AndroidManifest.xml
index c0e3321..55bef4a 100644
--- a/overlay/fonts/FontWenkaiOverlay/AndroidManifest.xml
+++ b/overlay/fonts/FontWenkaiOverlay/AndroidManifest.xml
@@ -14,14 +14,7 @@
     limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.overlay.font.wenkai"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <overlay
-        android:targetPackage="android"
-        android:category="android.theme.customization.font"
-        android:priority="1" />
+    package="com.android.overlay.font.wenkai">
 
     <application
         android:hasCode="false"
@@ -30,4 +23,9 @@
             android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
             android:value="wenkai,wenkai-medium" />
     </application>
+
+    <overlay
+        android:category="android.theme.customization.font"
+        android:priority="1"
+        android:targetPackage="android" />
 </manifest>
diff --git a/overlay/fonts/FontWkmonoOverlay/Android.bp b/overlay/fonts/FontWkmonoOverlay/Android.bp
index c7810db..2efd5f3 100644
--- a/overlay/fonts/FontWkmonoOverlay/Android.bp
+++ b/overlay/fonts/FontWkmonoOverlay/Android.bp
@@ -1,25 +1,7 @@
-//
-// Copyright (c) 2020,2022 The LineageOS Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
 
 runtime_resource_overlay {
     name: "FontWkmonoOverlay",
     theme: "FontWkmono",
+    sdk_version: "current",
     product_specific: true,
 }
diff --git a/overlay/fonts/FontWkmonoOverlay/AndroidManifest.xml b/overlay/fonts/FontWkmonoOverlay/AndroidManifest.xml
index 038a364..c9ee0ad 100644
--- a/overlay/fonts/FontWkmonoOverlay/AndroidManifest.xml
+++ b/overlay/fonts/FontWkmonoOverlay/AndroidManifest.xml
@@ -14,14 +14,7 @@
     limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.overlay.font.wkmono"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <overlay
-        android:targetPackage="android"
-        android:category="android.theme.customization.font"
-        android:priority="1" />
+    package="com.android.overlay.font.wkmono">
 
     <application
         android:hasCode="false"
@@ -30,4 +23,9 @@
             android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
             android:value="wkmono,wkmono-medium" />
     </application>
+
+    <overlay
+        android:category="android.theme.customization.font"
+        android:priority="1"
+        android:targetPackage="android" />
 </manifest>