diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
index dccbe6804..398044806 100644
--- a/.github/workflows/build-dev.yml
+++ b/.github/workflows/build-dev.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf196', 'cig_wf660a', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap111', 'edgecore_ecw5211', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap102', 'hfcl_ion4','hfcl_ion4xi_wp', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4xi_w', 'hfcl_ion4xi_HMR', 'hfcl_ion4x_w', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
+        target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf196', 'cig_wf660a', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap111', 'edgecore_ecw5211', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap102', 'hfcl_ion4','hfcl_ion4xi_wp', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4xi_w', 'hfcl_ion4xi_HMR', 'hfcl_ion4x_w', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018-v4', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/feeds/ipq807x_v5.4/ipq60xx/image/ipq60xx.mk b/feeds/ipq807x_v5.4/ipq60xx/image/ipq60xx.mk
index a1b6c69c2..a8a29ccaf 100644
--- a/feeds/ipq807x_v5.4/ipq60xx/image/ipq60xx.mk
+++ b/feeds/ipq807x_v5.4/ipq60xx/image/ipq60xx.mk
@@ -92,14 +92,14 @@ define Device/wallys_dr6018
 endef
 TARGET_DEVICES += wallys_dr6018
 
-define Device/wallys_dr6018_v4
+define Device/wallys_dr6018-v4
   DEVICE_TITLE := Wallys DR6018 V4
   DEVICE_DTS := qcom-ipq6018-wallys-dr6018-v4
   DEVICE_DTS_CONFIG := config@cp01-c4
   SUPPORTED_DEVICES := wallys,dr6018-v4
   DEVICE_PACKAGES := ath11k-wifi-wallys-dr6018-v4 uboot-envtools ath11k-firmware-qcn9000
 endef
-TARGET_DEVICES += wallys_dr6018_v4
+TARGET_DEVICES += wallys_dr6018-v4
 
 define Device/glinet_ax1800
   DEVICE_TITLE := GL-iNet AX1800
diff --git a/profiles/wallys_dr6018-v4.yml b/profiles/wallys_dr6018-v4.yml
new file mode 100644
index 000000000..df0f9221f
--- /dev/null
+++ b/profiles/wallys_dr6018-v4.yml
@@ -0,0 +1,16 @@
+---
+profile: wallys_dr6018-v4
+target: ipq60xx
+subtarget: generic
+description: Build image for the Wallys DR6018 V4
+image: bin/targets/ipq60xx/generic/openwrt-ipq60xx-wallys_dr6018-v4-squashfs-sysupgrade.tar
+feeds:
+  - name: ipq807x
+    path: ../../feeds/ipq807x_v5.4
+include:
+  - wifi-ax-v54
+  - ucentral-ap
+packages:
+  - ipq60xx
+diffconfig: |
+  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
diff --git a/profiles/wallys_dr6018_v4.yml b/profiles/wallys_dr6018_v4.yml
deleted file mode 100644
index 55281c7a1..000000000
--- a/profiles/wallys_dr6018_v4.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-profile: wallys_dr6018_v4
-target: ipq807x
-subtarget: ipq60xx
-description: Build image for the Wallys DR6018 V4
-image: bin/targets/ipq807x/ipq60xx/openwrt-ipq807x-wallys_dr6018_v4-squashfs-sysupgrade.tar
-feeds:
-  - name: ipq807x
-    path: ../../feeds/ipq807x
-include:
-  - wifi-ax
-  - ucentral-ap
-packages:
-  - ipq807x
-diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=0