diff --git a/device-cheetah.mk b/device-cheetah.mk
index afbedd2..61b50d6 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -108,7 +108,7 @@ PRODUCT_COPY_FILES += \
 	device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index a9e08fa..145de08 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -62,7 +62,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
 
diff --git a/device-panther.mk b/device-panther.mk
index e09cf45..c7bcc21 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -87,7 +87,7 @@ PRODUCT_COPY_FILES += \
     device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 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