diff --git a/device-cheetah.mk b/device-cheetah.mk
index 01e0dd3..e7b42ee 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -115,7 +115,7 @@ PRODUCT_COPY_FILES += \
 endif
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index 0a4dfc1..6abb728 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -69,7 +69,7 @@ PRODUCT_COPY_FILES += \
 endif
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-panther.mk b/device-panther.mk
index dde9314..36253be 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -94,7 +94,7 @@ PRODUCT_COPY_FILES += \
 endif
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index b3607e7..0f3af6d 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -66,7 +66,7 @@ PRODUCT_COPY_FILES += \
     device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st