diff --git a/device-husky.mk b/device-husky.mk
index 1a5778e..976e835 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
 	device/google/shusky/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-ripcurrent.mk b/device-ripcurrent.mk
index 5db8dd8..31f2212 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -67,7 +67,7 @@ PRODUCT_COPY_FILES += \
 	device/google/shusky/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-shiba.mk b/device-shiba.mk
index c14e453..ac1ec32 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -68,7 +68,7 @@ PRODUCT_COPY_FILES += \
 	device/google/shusky/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