diff --git a/Android.bp b/Android.bp
index 53768d3..e05f28d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -142,7 +142,7 @@ dex_import {
 }
 
 prebuilt_etc_xml {
-	name: "android.hardware.gnss@2.1-service-qti",
+	name: "android.hardware.gnss@2.1-service-qti.xml",
 	owner: "samsung",
 	src: "proprietary/vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml",
 	filename_from_src: true,
@@ -151,7 +151,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "android.hardware.health@2.1-samsung",
+	name: "android.hardware.health@2.1-samsung.xml",
 	owner: "samsung",
 	src: "proprietary/vendor/etc/vintf/manifest/android.hardware.health@2.1-samsung.xml",
 	filename_from_src: true,
@@ -160,7 +160,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "android.hardware.neuralnetworks@1.3-service-qti-hta",
+	name: "android.hardware.neuralnetworks@1.3-service-qti-hta.xml",
 	owner: "samsung",
 	src: "proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti-hta.xml",
 	filename_from_src: true,
@@ -169,7 +169,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "android.hardware.neuralnetworks@1.3-service-qti",
+	name: "android.hardware.neuralnetworks@1.3-service-qti.xml",
 	owner: "samsung",
 	src: "proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml",
 	filename_from_src: true,
@@ -178,7 +178,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "manifest_android.hardware.drm@1.3-service.widevine",
+	name: "manifest_android.hardware.drm@1.3-service.widevine.xml",
 	owner: "samsung",
 	src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml",
 	filename_from_src: true,
@@ -187,7 +187,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "vendor.samsung.hardware.thermal@1.0-manifest",
+	name: "vendor.samsung.hardware.thermal@1.0-manifest.xml",
 	owner: "samsung",
 	src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.thermal@1.0-manifest.xml",
 	filename_from_src: true,
diff --git a/sm8250-common-vendor.mk b/sm8250-common-vendor.mk
index e4c145a..1ff49cf 100644
--- a/sm8250-common-vendor.mk
+++ b/sm8250-common-vendor.mk
@@ -1361,12 +1361,12 @@ PRODUCT_PACKAGES += \
     HotwordEnrollmentXGoogleEx3HEXAGON \
     audiosphere \
     com.android.hotwordenrollment.common.util \
-    android.hardware.gnss@2.1-service-qti \
-    android.hardware.health@2.1-samsung \
-    android.hardware.neuralnetworks@1.3-service-qti-hta \
-    android.hardware.neuralnetworks@1.3-service-qti \
-    manifest_android.hardware.drm@1.3-service.widevine \
-    vendor.samsung.hardware.thermal@1.0-manifest \
+    android.hardware.gnss@2.1-service-qti.xml \
+    android.hardware.health@2.1-samsung.xml \
+    android.hardware.neuralnetworks@1.3-service-qti-hta.xml \
+    android.hardware.neuralnetworks@1.3-service-qti.xml \
+    manifest_android.hardware.drm@1.3-service.widevine.xml \
+    vendor.samsung.hardware.thermal@1.0-manifest.xml \
     android.hardware.keymaster@4.0-strongbox-service-qti
 
 PRODUCT_PACKAGES += \