diff --git a/device-cheetah.mk b/device-cheetah.mk
index e9ba6e4..be0451e 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -111,7 +111,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 8b2b419..0347420 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -65,7 +65,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 9501bb4..b90108a 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -90,7 +90,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 d6da01d..9906272 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -69,7 +69,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