diff --git a/packages/config/config/devices/0x0131/ah-nas-pd07u1.json b/packages/config/config/devices/0x0131/ah-nas-pd07u1.json
new file mode 100644
index 000000000000..ccaf2ab96b5a
--- /dev/null
+++ b/packages/config/config/devices/0x0131/ah-nas-pd07u1.json
@@ -0,0 +1,161 @@
+{
+	"manufacturer": "Alloy",
+	"manufacturerId": "0x0131",
+	"label": "AH-NAS-PD07U1",
+	"description": "5 in 1 PIR Motion Sensor",
+	"devices": [
+		{
+			"productType": "0x0004",
+			"productId": "0x1123"
+		}
+	],
+	"firmwareVersion": {
+		"min": "0.0",
+		"max": "255.255"
+	},
+	"associations": {
+		"1": {
+			"label": "Lifeline",
+			"maxNodes": 5,
+			"isLifeline": true
+		},
+		"2": {
+			"label": "Basic Set",
+			"maxNodes": 5
+		}
+	},
+	"paramInformation": [
+		{
+			"#": "1",
+			"$import": "~/templates/master_template.json#enable_led_indicator",
+			"defaultValue": 1
+		},
+		{
+			"#": "2",
+			"$import": "~/templates/master_template.json#base_enable_disable",
+			"label": "Motion Enable",
+			"defaultValue": 1
+		},
+		{
+			"#": "3",
+			"$import": "../0x0258/templates/shenzhen_neo_template.json#motion_prevent_retrigger"
+		},
+		{
+			"#": "4",
+			"$import": "~/templates/master_template.json#base_enable_disable",
+			"label": "Require Luminance Change for Basic Sets on Motion",
+			"description": "If enabled, a Basic Set will be sent if the ambient light is below the level defined in Parameter 14"
+		},
+		{
+			"#": "5",
+			"$import": "~/templates/master_template.json#base_enable_disable",
+			"label": "Binary Sensor Report Enable"
+		},
+		{
+			"#": "6",
+			"label": "Temperature Offset Value",
+			"valueSize": 1,
+			"unit": "0.1 °C/F",
+			"minValue": -120,
+			"maxValue": 120,
+			"defaultValue": 0,
+			"unsigned": false
+		},
+		{
+			"#": "7",
+			"label": "Humidity Offset Value",
+			"valueSize": 1,
+			"unit": "0.1 %",
+			"minValue": -120,
+			"maxValue": 120,
+			"defaultValue": 0,
+			"unsigned": false
+		},
+		{
+			"#": "8",
+			"label": "Temperature Change Report Threshold",
+			"valueSize": 1,
+			"unit": "0.1 °C/F",
+			"minValue": 0,
+			"maxValue": 100,
+			"defaultValue": 10
+		},
+		{
+			"#": "9",
+			"label": "Humidity Change Report Threshold",
+			"valueSize": 1,
+			"unit": "0.1 %",
+			"minValue": 0,
+			"maxValue": 100,
+			"defaultValue": 20
+		},
+		{
+			"#": "10",
+			"label": "Luminance Change Report Threshold",
+			"valueSize": 1,
+			"unit": "lux",
+			"minValue": 0,
+			"maxValue": 120,
+			"defaultValue": 50
+		},
+		{
+			"#": "11",
+			"label": "Association Group 2: Basic Set Level",
+			"valueSize": 1,
+			"minValue": 0,
+			"maxValue": 100,
+			"defaultValue": 100,
+			"options": [
+				{
+					"label": "On (255)",
+					"value": 100
+				}
+			]
+		},
+		{
+			"#": "12",
+			"label": "Basic Set Off Delay Time",
+			"valueSize": 2,
+			"unit": "seconds",
+			"minValue": 0,
+			"maxValue": 30000,
+			"defaultValue": 30
+		},
+		{
+			"#": "13",
+			"label": "Motion Clear Time",
+			"valueSize": 2,
+			"unit": "seconds",
+			"minValue": 1,
+			"maxValue": 30000,
+			"defaultValue": 30
+		},
+		{
+			"#": "14",
+			"label": "Luminance Threshold for Basic Sets",
+			"valueSize": 2,
+			"unit": "lux",
+			"minValue": 0,
+			"maxValue": 1000,
+			"defaultValue": 50
+		},
+		{
+			"#": "15",
+			"label": "Sensor Report Interval",
+			"valueSize": 2,
+			"unit": "seconds",
+			"minValue": 0,
+			"maxValue": 30000,
+			"defaultValue": 180
+		},
+		{
+			"#": "99",
+			"label": "Light Intensity Offset Value",
+			"description": "See manual for details",
+			"valueSize": 2,
+			"minValue": 1,
+			"maxValue": 32767,
+			"defaultValue": 450
+		}
+	]
+}
diff --git a/packages/config/config/devices/0x0131/ah-neo-ds07z.json b/packages/config/config/devices/0x0131/ah-neo-ds07z.json
new file mode 100644
index 000000000000..265511b4cad1
--- /dev/null
+++ b/packages/config/config/devices/0x0131/ah-neo-ds07z.json
@@ -0,0 +1,124 @@
+{
+	"manufacturer": "Alloy",
+	"manufacturerId": "0x0131",
+	"label": "AH-NEO-DS07Z",
+	"description": "Contact Sensor 2",
+	"devices": [
+		{
+			"productType": "0x0004",
+			"productId": "0x1118"
+		}
+	],
+	"firmwareVersion": {
+		"min": "2.0",
+		"max": "255.255"
+	},
+	"associations": {
+		"1": {
+			"label": "Lifeline",
+			"maxNodes": 5,
+			"isLifeline": true
+		},
+		"2": {
+			"label": "Basic Set",
+			"maxNodes": 5
+		}
+	},
+	"paramInformation": [
+		{
+			"#": "1",
+			"$import": "~/templates/master_template.json#enable_led_indicator",
+			"defaultValue": 1
+		},
+		{
+			"#": "2",
+			"$import": "~/templates/master_template.json#base_enable_disable",
+			"label": "Binary Sensor Report"
+		},
+		{
+			"#": "3",
+			"label": "Temperature Calibration",
+			"valueSize": 1,
+			"unit": "0.1 (°C/°F)",
+			"minValue": -120,
+			"maxValue": 120,
+			"defaultValue": 0,
+			"unsigned": false
+		},
+		{
+			"#": "4",
+			"label": "Humidity Calibration",
+			"valueSize": 1,
+			"unit": "0.1 %rH",
+			"minValue": -120,
+			"maxValue": 120,
+			"defaultValue": 0,
+			"unsigned": false
+		},
+		{
+			"#": "5",
+			"label": "Temperature Change Report Threshold",
+			"valueSize": 1,
+			"unit": "0.1 (°C/°F)",
+			"minValue": 0,
+			"maxValue": 100,
+			"defaultValue": 10
+		},
+		{
+			"#": "6",
+			"label": "Humidity Change Report Threshold",
+			"valueSize": 1,
+			"unit": "0.1 %rH",
+			"minValue": 0,
+			"maxValue": 100,
+			"defaultValue": 20
+		},
+		{
+			"#": "7",
+			"label": "Association Group 2: Basic Set Value (Open)",
+			"valueSize": 1,
+			"minValue": 0,
+			"maxValue": 100,
+			"defaultValue": 100,
+			"options": [
+				{
+					"label": "Off (0x00)",
+					"value": 0
+				},
+				{
+					"label": "On (0xff)",
+					"value": 100
+				}
+			]
+		},
+		{
+			"#": "8",
+			"label": "Association Group 2: Basic Set Off Delay Time (Close)",
+			"valueSize": 2,
+			"unit": "seconds",
+			"minValue": 0,
+			"maxValue": 30000,
+			"defaultValue": 30
+		},
+		{
+			"#": "9",
+			"label": "Sensor Measuring Interval",
+			"valueSize": 2,
+			"unit": "seconds",
+			"minValue": 0,
+			"maxValue": 30000,
+			"defaultValue": 180,
+			"options": [
+				{
+					"label": "Disable",
+					"value": 0
+				}
+			]
+		}
+	],
+	"metadata": {
+		"inclusion": "1. Power Up The Device.\n2. Set Z-Wave Controller Into Inclusion Mode\n3. Press And Hold The Button For 5s Until White Led Lights Is On, Then Release The Button Before Led Turn Off.\nBlue Led Will Blink With 1s Interval Until Inclusion Successful.",
+		"exclusion": "1. Power Up The Device.\n2. Set Z-Wave Controller Into Exclusion Mode\n3. Press And Hold The Button For 5s Until White Led Lights Is On, Then Release The Button Before Led Turn Off.\nBlue Led Will Blink With 0.5sinterval Until Exclusion Successful.",
+		"reset": "1. Power Up The Device.\n2. Press And Hold The Button For 10s Until Pink Led Lights Is On, Then Release The Button Before Led Turn Off."
+	}
+}
diff --git a/packages/config/config/devices/0x0258/nas-pd07u1.json b/packages/config/config/devices/0x0258/nas-pd07u1.json
index 89b2397f0664..a5443315c5ce 100644
--- a/packages/config/config/devices/0x0258/nas-pd07u1.json
+++ b/packages/config/config/devices/0x0258/nas-pd07u1.json
@@ -36,7 +36,7 @@
 			"#": "4",
 			"$import": "~/templates/master_template.json#base_enable_disable",
 			"label": "Require Luminance Change for Basic Sets on Motion",
-			"description": "If enabled, a Basic Set will be set if the ambient light is below the level defined in Parameter 16"
+			"description": "If enabled, a Basic Set will be sent if the ambient light is below the level defined in Parameter 16"
 		},
 		{
 			"#": "5",
diff --git a/packages/config/config/devices/0x0258/neo-ds07z.json b/packages/config/config/devices/0x0258/neo-ds07z.json
index 93bfb3516055..9580426311b9 100644
--- a/packages/config/config/devices/0x0258/neo-ds07z.json
+++ b/packages/config/config/devices/0x0258/neo-ds07z.json
@@ -35,9 +35,9 @@
 		},
 		{
 			"#": "4",
-			"label": "Humidity Offset Value",
+			"label": "Humidity Calibration",
 			"valueSize": 1,
-			"unit": "0.1 (RH%)",
+			"unit": "0.1 %rH",
 			"minValue": -120,
 			"maxValue": 120,
 			"defaultValue": 0,