diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-re-ss-01.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-re-ss-01.dts
index c09f77e65..b53ae071b 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-re-ss-01.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-re-ss-01.dts
@@ -212,6 +212,7 @@
 
 &wifi {
 	status = "okay";
-	qcom,ath11k-calibration-variant = "JDC-AX1800-Pro";
+
+	qcom,ath11k-calibration-variant = "JDC-RE-SS-01";
 	qcom,ath11k-fw-memory-mode = <1>;
 };
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-02.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-02.dts
index 436f8127e..0e7f2750b 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-02.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-re-cs-02.dts
@@ -143,15 +143,17 @@
 	perst-gpio = <&tlmm 53 GPIO_ACTIVE_LOW>;
 	status = "okay";
 
-	bridge@0,0 {
-		reg = <0x00000000 0 0 0 0>;
+	pcie@0 {
+		reg = <0x0 0x0 0x0 0x0 0x0>;
+		bus-range = <0x01 0xff>;
 		#address-cells = <3>;
 		#size-cells = <2>;
 		ranges;
 
-		wifi@1,0 {
+		wifi@0,0 {
 			compatible = "pci17cb,1104";
 			reg = <0x00010000 0 0 0 0>;
+			qcom,ath11k-calibration-variant = "JDC-RE-CS-02";
 		};
 	};
 };
@@ -288,5 +290,6 @@
 
 &wifi {
 	status = "okay";
-	qcom,ath11k-calibration-variant = "JDC-AX6600";
+
+	qcom,ath11k-calibration-variant = "JDC-RE-CS-02";
 };
diff --git a/target/linux/qualcommax/image/ipq60xx.mk b/target/linux/qualcommax/image/ipq60xx.mk
index 1228c1900..f63640814 100644
--- a/target/linux/qualcommax/image/ipq60xx.mk
+++ b/target/linux/qualcommax/image/ipq60xx.mk
@@ -52,7 +52,7 @@ define Device/jdcloud_re-cs-02
 	BLOCKSIZE := 64k
 	KERNEL_SIZE := 6144k
 	DEVICE_DTS_CONFIG := config@cp03-c3
-	DEVICE_PACKAGES := ipq-wifi-jdcloud_re-cs-02 kmod-ath11k-pci ath11k-firmware-qcn9074
+	DEVICE_PACKAGES := ath11k-firmware-qcn9074 ipq-wifi-jdcloud_re-cs-02 kmod-ath11k-pci
 endef
 TARGET_DEVICES += jdcloud_re-cs-02
 
@@ -78,7 +78,7 @@ define Device/jdcloud_re-ss-01
 	BLOCKSIZE := 64k
 	KERNEL_SIZE := 6144k
 	DEVICE_DTS_CONFIG := config@cp03-c2
-	DEVICE_PACKAGES := ipq-wifi-jdcloud_ax1800pro
+	DEVICE_PACKAGES := ipq-wifi-jdcloud_re-ss-01
 endef
 TARGET_DEVICES += jdcloud_re-ss-01