diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml
index f50d3159..8357814b 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml
@@ -35,9 +35,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1019%2B_25556.pat"
       md5: "a5291a1d0f31518c09c616502e1433a6"
@@ -53,9 +53,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1019%2B_42218.pat"
       md5: "a7c5ac7a5963aac8bf9a599a8a6f6b86"
@@ -71,9 +71,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1019%2B_42661.pat"
       md5: "1318c234b08c06ad0a6b49a3d739fb95"
@@ -89,9 +89,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1019%2B_42962.pat"
       md5: "b590bc9f0df784be4d6bae13d551f76b"
@@ -107,9 +107,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1019%2B_64570.pat"
       md5: "c1c9b295ca7f1434c0f1eeab4f989316"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml
index 02c85aff..dd28b376 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml
@@ -33,9 +33,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1520%2B_25556.pat"
       md5: "d14c87ddd7c76c4c4156692b4a2c57f7"
@@ -50,9 +50,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1520%2B_42218.pat"
       md5: "d1ebc3c9a2b9e04980a85c4784904f91"
@@ -67,9 +67,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1520%2B_42661.pat"
       md5: "1d8ecfcb2a956488ae355c79a72bb9ec"
@@ -84,9 +84,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1520%2B_42962.pat"
       md5: "d28994a9dcdae9730b4d1370a39d3130"
@@ -101,9 +101,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1520%2B_64570.pat"
       md5: "5063db1ed248fb36074ce8d2aba645a9"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
index 0fae32de..44edfcdd 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
@@ -34,9 +34,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1621%2B_25556.pat"
       md5: "e6be691eb7df063a59f3889ede1b43ce"
@@ -51,9 +51,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1621%2B_42218.pat"
       md5: "1fd1d6e733bb096f418f68e06f81022e"
@@ -68,9 +68,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1621%2B_42661.pat"
       md5: "b4b72eb8d4e84b2e2a8c29fc0a1ac6aa"
@@ -85,9 +85,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1621%2B_42962.pat"
       md5: "93a5a2b9515b39e18d0b48df84d5c007"
@@ -102,9 +102,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1621%2B_64570.pat"
       md5: "6f9fa1ff5b9b2dded366b1a2d2687aea"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml
index b3efda1f..679865bd 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml
@@ -33,9 +33,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS1621xs%2B_25556.pat"
       md5: "980277a06f6ba645e8ae64121788beb7"
@@ -51,9 +51,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS1621xs%2B_42218.pat"
       md5: "302fdefb00c8d4f8bf95ac25dca1e864"
@@ -69,9 +69,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS1621xs%2B_42661.pat"
       md5: "18f849121a9a1918aca94c6774524910"
@@ -87,9 +87,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS1621xs%2B_42962.pat"
       md5: "fffec3510c954fc718a1aecba2f98fc6"
@@ -105,9 +105,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1621xs%2B_64570.pat"
       md5: "ff027f65c9712059a5a54bfbfb5a52b7"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml
index 6857a5aa..639d51ca 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml
@@ -33,9 +33,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_DS1823xs%2B_42962.pat"
       md5: "1011932a1cfb8aa07e77beebede87a71"
@@ -50,9 +50,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS1823xs%2B_64570.pat"
       md5: "1a8a5e1d8461e9a3af638dae7f121ad3"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
index f2c9598e..d28c1da4 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
@@ -34,9 +34,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS2422%2B_42218.pat"
       md5: "7fe3c9ae80396a2ea9ed9909b8746c4b"
@@ -51,9 +51,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS2422%2B_42661.pat"
       md5: "9ea5e0fe94c01072da36e2f69172abb3"
@@ -68,9 +68,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS2422%2B_42962.pat"
       md5: "b00d3d1ccf1b1a6982b2b594420e0f3c"
@@ -85,9 +85,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS2422%2B_64570.pat"
       md5: "3e5e09f4d4b0f09ab03f28d12b76f03a"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml
index 0547e425..2c7a3d9f 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml
@@ -36,9 +36,9 @@ builds:
     kver: "3.10.105"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS3615xs_25556.pat"
       md5: "c166cbd39de4d4908e9ce36b93c19274"
@@ -54,9 +54,9 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3615xs_42218.pat"
       md5: "9f959ec4d16d5d7729374961fc2b9bed"
@@ -72,9 +72,9 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS3615xs_42661.pat"
       md5: "271b34cb2a0c23d63178aef3bf45a6ae"
@@ -90,9 +90,9 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS3615xs_42962.pat"
       md5: "cb864a71a791f9a25939356053d25b30"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml
index 10655dab..a804e556 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml
@@ -36,9 +36,9 @@ builds:
     kver: "3.10.105"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS3617xs_25556.pat"
       md5: "0cc513483fb3c82815ca7dd50fa52e4f"
@@ -54,9 +54,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3617xs_42218.pat"
       md5: "b7d85926561ff125928b68e7fffa646b"
@@ -72,9 +72,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS3617xs_42661.pat"
       md5: "94e6263912bc758ee3db81c62a94a8f6"
@@ -90,9 +90,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS3617xs_42962.pat"
       md5: "b46e3d7933c7f77c78d536d33f9b5c4a"
@@ -108,9 +108,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS3617xs_64570.pat"
       md5: "4c6165e5c87d83d52a173679d320383f"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml
index 4c39d2c4..98eae432 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml
@@ -36,9 +36,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat"
       md5: "b9b452577b38adc82aca42e031be267b"
@@ -54,9 +54,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS3622xs%2B_42661.pat"
       md5: "7af76cca8226ecf95b25630bffa76b3d"
@@ -72,9 +72,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS3622xs%2B_42962.pat"
       md5: "d3b223e1e973fcf5c67c64e72775a576"
@@ -90,9 +90,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS3622xs%2B_64570.pat"
       md5: "456fc142cf8d3f1c329601c9d9ed66f5"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml
index f797a93f..d11b9e07 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml
@@ -36,9 +36,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS720%2B_25556.pat"
       md5: "ae36c9277e076f5b6989532deac5feb0"
@@ -53,9 +53,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS720%2B_42218.pat"
       md5: "83dd377fa9d66f21e2ab2536bb9a3943"
@@ -70,9 +70,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS720%2B_42661.pat"
       md5: "c811400d228502f37370b527b5624967"
@@ -87,9 +87,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS720%2B_42962.pat"
       md5: "9ecc37490cb6e4de3af666db5766cb21"
@@ -104,9 +104,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS720%2B_64570.pat"
       md5: "6ff89c899fa9ef0e546a45bc8a5d1b50"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml
index 9dc3f4e8..b239ff9e 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml
@@ -32,9 +32,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_DS723%2B_42962.pat"
       md5: "e8e6598014205a9cfb98c95183e856fe"
@@ -49,9 +49,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS723%2B_64570.pat"
       md5: "302f4427cc76bc3830afc5cff1424298"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled
index 87bba960..5e7ee9be 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS916+.yml.disabled
@@ -34,9 +34,9 @@ builds:
     kver: "3.10.105"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS916%2B_25556.pat"
       md5: "03b17f09626d77a3f99078380c930597"
@@ -52,9 +52,9 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS916%2B_42218.pat"
       md5: "ed7c45bef0e8a19ae4d1451745d87959"
@@ -70,9 +70,9 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS916%2B_42661.pat"
       md5: "d1f7e79208d48731af49b2ca6e117542"
@@ -88,9 +88,9 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS916%2B_42962.pat"
       md5: "19bf342e86c825e1a676c5a7a86b353d"
@@ -106,9 +106,9 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS916%2B_64570.pat"
       md5: "32aa3791b7b4bbdf4b0fe8849e59202d"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml
index 41831194..d02abb80 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml
@@ -38,9 +38,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS918%2B_25556.pat"
       md5: "e44e9590f23a1a6b593d40db182269c5"
@@ -56,9 +56,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS918%2B_42218.pat"
       md5: "0c8a0d2dc6f1d7e37ee63d74760808b8"
@@ -74,9 +74,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS918%2B_42661.pat"
       md5: "2c49260d2646a0944b56933f7d4029fb"
@@ -92,9 +92,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS918%2B_42962.pat"
       md5: "d5b62813ebc2d78bdbdf08b2c42e1280"
@@ -110,9 +110,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS918%2B_64570.pat"
       md5: "4fab55b87cb153239536cca3947f4513"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
index 77eb63c0..00c614ab 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
@@ -37,9 +37,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DS920%2B_25556.pat"
       md5: "6b20f985a5a7fc4c40cab223a96c173b"
@@ -54,9 +54,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS920%2B_42218.pat"
       md5: "55a7e4ccbf6fcba9238a11976a4a7381"
@@ -71,9 +71,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS920%2B_42661.pat"
       md5: "fa3936a53299b1a1142e4c614e2b360c"
@@ -88,9 +88,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS920%2B_42962.pat"
       md5: "69792ae34d9b3c6e707d0e3e6b82816f"
@@ -105,9 +105,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS920%2B_64570.pat"
       md5: "753b33e8c92bbf331be8e58dd97c242f"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml
index 101069ba..ed0bb45b 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml
@@ -32,9 +32,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_DS923%2B_42962.pat"
       md5: "fd4d36adb0645f7c1215854405da62c3"
@@ -49,9 +49,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS923%2B_64570.pat"
       md5: "8504b920d4af57a5daa3d573cac34870"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
index 73fd9839..783d2abf 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
@@ -36,9 +36,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA1622_42661.pat"
       md5: "27515a2e7c2f2113ccf8955bf22f3974"
@@ -53,9 +53,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA1622_42962.pat"
       md5: "6073f5daa75a0eda84e6a3f3cbae4920"
@@ -70,9 +70,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA1622_64570.pat"
       md5: "5729fdc37d56ba46e556a5b6aa931b42"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml
index 1bff72ed..2d814de8 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml
@@ -36,9 +36,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DVA3219_25556.pat"
       md5: "20f034e7fa233d95a0160d7479474906"
@@ -54,9 +54,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DVA3219_42218.pat"
       md5: "4345e7cff9ba4fe97793c254c87b3ed5"
@@ -72,9 +72,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA3219_42661.pat"
       md5: "5c4dea4a45d96e1a6d5bcc041d300079"
@@ -90,9 +90,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA3219_42962.pat"
       md5: "6aa37856c3bf2a390f99420b2e7dffa4"
@@ -108,9 +108,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA3219_64570.pat"
       md5: "fe64fb7cbcdb699b086579a4a12029f6"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml
index e4cc0611..c8e148fe 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml
@@ -38,9 +38,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_DVA3221_25556.pat"
       md5: "bfe93fcc3a0f4e41eaf7a3a3b865124b"
@@ -56,9 +56,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DVA3221_42218.pat"
       md5: "e3455afd4644cb882cb2c9bede08c7bf"
@@ -74,9 +74,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA3221_42661.pat"
       md5: "d433ae251ba95754edde1586851d1e0a"
@@ -92,9 +92,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA3221_42962.pat"
       md5: "23a98723cacf1e1bd248cf8ab07bd788"
@@ -110,9 +110,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA3221_64570.pat"
       md5: "2002e02d355c43e266222307e041302a"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml
index 9bdb4167..464f8dd8 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml
@@ -32,9 +32,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_FS2500_42218.pat"
       md5: "9562d49a07f5481208b672ff777f3cbf"
@@ -49,9 +49,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_FS2500_42661.pat"
       md5: "e071c4984d041309f151de29b9ba82b5"
@@ -66,9 +66,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_FS2500_42962.pat"
       md5: "169493af5375eb9da89ff324a3fe129a"
@@ -83,9 +83,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_FS2500_64570.pat"
       md5: "faab7cd3b7456a406f4be1afe9012d5d"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled
index 087d7d63..4a4a7871 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled
@@ -32,9 +32,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_FS6400_25556.pat"
       md5: "c2d4e93551189532d8bd7bbcf2f55411"
@@ -49,9 +49,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_FS6400_42218.pat"
       md5: "e7887381980432a7be5ddf4dec0772ad"
@@ -66,9 +66,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_FS6400_42661.pat"
       md5: "030064272d82777681502745fcfa8c48"
@@ -83,9 +83,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_FS6400_42962.pat"
       md5: "651be491d10a47ecc534295d84341c03"
@@ -100,9 +100,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_FS6400_64570.pat"
       md5: "2e69250e65f75bd4bb9e8274d865bc70"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml
index 01b69de2..0e23d7d4 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml
@@ -35,9 +35,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS1221%2B_25556.pat"
       md5: "121a66f051ece4cf08ebb492f964a4d5"
@@ -52,9 +52,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS1221%2B_42218.pat"
       md5: "9ab734898b1f8af906b65ff91bf2b399"
@@ -69,9 +69,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS1221%2B_42661.pat"
       md5: "9fbcbffb36e86b86584b416e45d8d0bd"
@@ -86,9 +86,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS1221%2B_42962.pat"
       md5: "441e25883733556af6fb6cbab74090fd"
@@ -103,9 +103,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS1221%2B_64570.pat"
       md5: "d71d82a7b5d978ad14e351817d176578"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml
index 70a987c0..9a878426 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml
@@ -32,9 +32,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS1619xs%2B_25556.pat"
       md5: "0658c032de104ae55950c256b697132d"
@@ -50,9 +50,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS1619xs%2B_42218.pat"
       md5: "1ef98087cb11be286a8eac26f55dbe52"
@@ -68,9 +68,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS1619xs%2B_42661.pat"
       md5: "0c0b793d8ae1f0a1ecba66e280bd81e7"
@@ -86,9 +86,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS1619xs%2B_42962.pat"
       md5: "7e0747b8808941d51c35de503473b62e"
@@ -104,9 +104,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS1619xs%2B_64570.pat"
       md5: "631c7162e33a11d4555121a188540c83"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml
index b7405e60..4c6ad0f5 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml
@@ -35,9 +35,9 @@ builds:
     kver: "3.10.105"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS3413xs%2B_25556.pat"
       md5: "9651b2cd3fd42e45450a72617fbb2803"
@@ -53,9 +53,9 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS3413xs%2B_42218.pat"
       md5: "2f2e7312db70ca36b3c09236f117f23f"
@@ -71,9 +71,9 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS3413xs%2B_42661.pat"
       md5: "f4ffa894e9b7218ea12d601d493fcda2"
@@ -89,9 +89,9 @@ builds:
     kver: "3.10.108"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS3413xs%2B_42962.pat"
       md5: "508ed0ce3b827dcff5f6796700098a5c"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml
index 679a7f47..0b135d90 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml
@@ -36,9 +36,9 @@ builds:
     kver: "3.10.105"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS3618xs_25556.pat"
       md5: "d71c24813b6f1032a5f55e6dc206985f"
@@ -54,9 +54,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS3618xs_42218.pat"
       md5: "e91236e37fdbbb3a4f368dffa5a63013"
@@ -72,9 +72,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS3618xs_42661.pat"
       md5: "f36f1f22a48b184358823b6168a904fd"
@@ -90,9 +90,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_RS3618xs_42962.pat"
       md5: "dce0cd634df74b45c09379d9f348c16d"
@@ -108,9 +108,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS3618xs_64570.pat"
       md5: "bcf1a8b41452fd8bf8f35d2e698894ce"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml
index f9e07c1d..aebd97e6 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml
@@ -32,9 +32,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS3621xs%2B_25556.pat"
       md5: "e493fbac6a3b0116a8286e42ff0e4559"
@@ -50,9 +50,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS3621xs%2B_42218.pat"
       md5: "f2b6896f7ea7237bd52501f80e502396"
@@ -68,9 +68,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS3621xs%2B_42661.pat"
       md5: "5dd0954d761e8ac81f3e2f50e088fb8e"
@@ -86,9 +86,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_RS3621xs%2B_42962.pat"
       md5: "02d56d400ac1c57593bc2faf9cc16a9b"
@@ -104,9 +104,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS3621xs%2B_64570.pat"
       md5: "b1517fb23721192de7e666da8cd2ae00"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml
index 932cb6b0..1221a9b4 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml
@@ -32,9 +32,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_RS4021xs%2B_25556.pat"
       md5: "b5f616abfbed3ab61d1fa043ae3d67aa"
@@ -50,9 +50,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS4021xs%2B_42218.pat"
       md5: "cbcb77548de26b6843ab31d7a7258b62"
@@ -68,9 +68,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS4021xs%2B_42661.pat"
       md5: "ddbbbcf8ccb8d9d345df3e08debc66f6"
@@ -86,9 +86,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_RS4021xs%2B_42962.pat"
       md5: "cef9e139ddc27ddcc61f5423bac47659"
@@ -104,9 +104,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS4021xs%2B_64570.pat"
       md5: "a55ff87947b0ad53e981dc1ffd23c829"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml
index 92b75172..850aca00 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml
@@ -34,9 +34,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_SA3400_25556.pat"
       md5: "c6918f2e859cb84ff7349e93cef51237"
@@ -52,9 +52,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_SA3400_42218.pat"
       md5: "236dbf3601ffec5259a3c9d42bb640ba"
@@ -70,9 +70,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_SA3400_42661.pat"
       md5: "ae40bcb16dc2c6977371bd0349dde3c2"
@@ -88,9 +88,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_SA3400_42962.pat"
       md5: "cc0a219656db7ef26587ed59bbf1643f"
@@ -106,9 +106,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA3400_64570.pat"
       md5: "eabb43133e9136a808bc7f4442f01000"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled
index 7dab185e..72da0af9 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled
@@ -36,9 +36,9 @@ builds:
     kver: "4.4.59"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/6.2.4/25556/DSM_SA3600_25556.pat"
       md5: "5fcc06efe85c74276736dd49717c33f1"
@@ -54,9 +54,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_SA3600_42218.pat"
       md5: "64c75bdf8d28761cb294e41bf3aee2e9"
@@ -72,9 +72,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_SA3600_42661.pat"
       md5: "ece886eba8b0c2eaf260704dbd20f9a7"
@@ -90,9 +90,9 @@ builds:
     kver: "4.4.180"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_SA3600_42962.pat"
       md5: "7c21732ca4f4cb4cf43538a3d9497cf8"
@@ -108,9 +108,9 @@ builds:
     kver: "4.4.302"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA3600_64570.pat"
       md5: "cc489fe3b383290713dd13f363a1ee7e"
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml
index f9036b37..2ac4d9a1 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml
@@ -30,9 +30,9 @@ builds:
     kver: "5.10.55"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-6/DSM_SA6400_42962.pat"
       md5: "7bb63d65829b2ad4bcfda3b37e0ac1b1"
@@ -47,9 +47,9 @@ builds:
     kver: "5.10.55"
     rd-compressed: false
     cmdline:
-      !!merge <<: *cmdline
+      <<: *cmdline
     synoinfo:
-      !!merge <<: *synoinfo
+      <<: *synoinfo
     pat:
       url: "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA6400_64570.pat"
       md5: "83b591bfb240c51b2feff8f02eac8bde"