diff --git a/code/nrf-connect/samples/zigbee/Kconfig b/code/nrf-connect/samples/zigbee/Kconfig
index f60ec56..a2ef6c4 100644
--- a/code/nrf-connect/samples/zigbee/Kconfig
+++ b/code/nrf-connect/samples/zigbee/Kconfig
@@ -8,10 +8,10 @@ config PRST_ZB_PARENT_POLL_INTERVAL_SEC
 	int "Interval for when b-parasite polls its parent for data (in seconds)"
 	default 60
 
-config BUILD_DATE
-  string "Zigbee app init basic date code. Can be used as build revision."
+config PRST_ZB_BUILD_DATE
+  string "Zigbee app init basic date code. Can be used as build revision. (1 byte)"
   default "20221214"
 
-config MODEL_ID
+config PRST_ZB_MODEL_ID
   string "Zigbee app model id."
   default "b-parasite"
\ No newline at end of file
diff --git a/code/nrf-connect/samples/zigbee/src/prst_zb_attrs.c b/code/nrf-connect/samples/zigbee/src/prst_zb_attrs.c
index a21ae28..c241458 100644
--- a/code/nrf-connect/samples/zigbee/src/prst_zb_attrs.c
+++ b/code/nrf-connect/samples/zigbee/src/prst_zb_attrs.c
@@ -14,13 +14,13 @@ void prst_zb_attrs_init(struct zb_device_ctx *dev_ctx) {
 
   ZB_ZCL_SET_STRING_VAL(
       dev_ctx->basic_attr.model_id,
-      PRST_BASIC_MODEL_ID,
-      ZB_ZCL_STRING_CONST_SIZE(PRST_BASIC_MODEL_ID));
+      CONFIG_PRST_ZB_MODEL_ID,
+      ZB_ZCL_STRING_CONST_SIZE(CONFIG_PRST_ZB_MODEL_ID));
 
   ZB_ZCL_SET_STRING_VAL(
     dev_ctx->basic_attr.date_code,
-    PRST_BASIC_DATE_CODE,
-    ZB_ZCL_STRING_CONST_SIZE(PRST_BASIC_DATE_CODE));
+    CONFIG_PRST_ZB_BUILD_DATE,
+    ZB_ZCL_STRING_CONST_SIZE(CONFIG_PRST_ZB_BUILD_DATE));
 
   dev_ctx->identify_attr.identify_time =
       ZB_ZCL_IDENTIFY_IDENTIFY_TIME_DEFAULT_VALUE;
diff --git a/code/nrf-connect/samples/zigbee/src/prst_zb_endpoint_defs.h b/code/nrf-connect/samples/zigbee/src/prst_zb_endpoint_defs.h
index 149c31f..f66f877 100644
--- a/code/nrf-connect/samples/zigbee/src/prst_zb_endpoint_defs.h
+++ b/code/nrf-connect/samples/zigbee/src/prst_zb_endpoint_defs.h
@@ -5,8 +5,6 @@
 
 #define PRST_ZIGBEE_ENDPOINT 10
 #define PRST_BASIC_MANUF_NAME "b-parasite"
-#define PRST_BASIC_MODEL_ID CONFIG_MODEL_ID
-#define PRST_BASIC_DATE_CODE CONFIG_BUILD_DATE
 
 #define PRST_ZB_DEVICE_ID 0x0008
 #define PRST_ZB_DEVICE_VERSION 0