diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
index 5b9fb2c6..e55cb9d6 100755
--- a/files/initrd/opt/arc/arc.sh
+++ b/files/initrd/opt/arc/arc.sh
@@ -80,9 +80,9 @@ function arcModel() {
         [ "${DT}" = "true" ] && HBAS="" || HBAS="x"
         [ "${M}" = "SA6400" ] && HBAS="x"
         [ "${DT}" = "false" ] && USBS="int/ext" || USBS="ext"
-        [[ "${M}" = "DS718+" || "${M}" = "DS918+" || "${M}" = "DS1019+" || "${M}" = "DS1621xs+" || "${M}" = "RS1619xs+" ]] && M_2_CACHE="+" || M_2_CACHE="x"
+        M_2_CACHE="x"
         [[ "${M}" = "DS220+" ||  "${M}" = "DS224+" ]] && M_2_CACHE=""
-        [[ "${M}" = "DS220+" || "${M}" = "DS224+" || "${M}" = "DS718+" || "${M}" = "DS918+" || "${M}" = "DS1019+" || "${M}" = "DS1621xs+" || "${M}" = "RS1619xs+" ]] && M_2_STORAGE="" || M_2_STORAGE="+"
+        [[ "${M}" = "DS220+" || "${M}" = "DS224+" || "${DT}" = "false" ]] && M_2_STORAGE="" || M_2_STORAGE="+"
         # Check id model is compatible with CPU
         if [ ${RESTRICT} -eq 1 ]; then
           for F in ${FLAGS}; do
diff --git a/files/initrd/opt/arc/evo.sh b/files/initrd/opt/arc/evo.sh
index efeaf111..c7cb9fd1 100755
--- a/files/initrd/opt/arc/evo.sh
+++ b/files/initrd/opt/arc/evo.sh
@@ -80,9 +80,9 @@ function arcModel() {
         [ "${DT}" = "true" ] && HBAS="" || HBAS="x"
         [ "${M}" = "SA6400" ] && HBAS="x"
         [ "${DT}" = "false" ] && USBS="int/ext" || USBS="ext"
-        [[ "${M}" = "DS718+" || "${M}" = "DS918+" || "${M}" = "DS1019+" || "${M}" = "DS1621xs+" || "${M}" = "RS1619xs+" ]] && M_2_CACHE="+" || M_2_CACHE="x"
+        M_2_CACHE="x"
         [[ "${M}" = "DS220+" ||  "${M}" = "DS224+" ]] && M_2_CACHE=""
-        [[ "${M}" = "DS220+" || "${M}" = "DS224+" || "${M}" = "DS718+" || "${M}" = "DS918+" || "${M}" = "DS1019+" || "${M}" = "DS1621xs+" || "${M}" = "RS1619xs+" ]] && M_2_STORAGE="" || M_2_STORAGE="+"
+        [[ "${M}" = "DS220+" || "${M}" = "DS224+" || "${DT}" = "false" ]] && M_2_STORAGE="" || M_2_STORAGE="+"
         # Check id model is compatible with CPU
         if [ ${RESTRICT} -eq 1 ]; then
           for F in ${FLAGS}; do
diff --git a/files/initrd/opt/arc/informations/apollolake.yml b/files/initrd/opt/arc/informations/apollolake.yml
index 40828426..c821f671 100644
--- a/files/initrd/opt/arc/informations/apollolake.yml
+++ b/files/initrd/opt/arc/informations/apollolake.yml
@@ -24,6 +24,6 @@ As external: yes
 Community Package required *
 
 - NVMe
-Cache: yes (sometimes addon required)
-Storage: Addon required
+Cache: yes
+Storage: no
 System (NVMe only): no
\ No newline at end of file
diff --git a/files/initrd/opt/arc/informations/broadwell.yml b/files/initrd/opt/arc/informations/broadwell.yml
index 6375b8e6..68b8448a 100644
--- a/files/initrd/opt/arc/informations/broadwell.yml
+++ b/files/initrd/opt/arc/informations/broadwell.yml
@@ -24,6 +24,6 @@ Unsupported
 Community Package required *
 
 - NVMe
-Cache: yes (sometimes addon required)
-Storage: Addon required
+Cache: yes
+Storage: no
 System (NVMe only): no
\ No newline at end of file
diff --git a/files/initrd/opt/arc/informations/broadwellnk.yml b/files/initrd/opt/arc/informations/broadwellnk.yml
index a55b31c2..ed1ba0d4 100644
--- a/files/initrd/opt/arc/informations/broadwellnk.yml
+++ b/files/initrd/opt/arc/informations/broadwellnk.yml
@@ -24,6 +24,6 @@ Unsupported
 Community Package required *
 
 - NVMe
-Cache: yes (sometimes addon required)
-Storage: Addon required
+Cache: yes
+Storage: no
 System (NVMe only): no
\ No newline at end of file
diff --git a/files/initrd/opt/arc/informations/denverton.yml b/files/initrd/opt/arc/informations/denverton.yml
index 632641d2..9ae857ec 100644
--- a/files/initrd/opt/arc/informations/denverton.yml
+++ b/files/initrd/opt/arc/informations/denverton.yml
@@ -26,6 +26,6 @@ Partially natively supported
 Community Package required *
 
 - NVMe
-Cache: yes (sometimes addon required)
-Storage: Addon required
+Cache: yes
+Storage: no
 System (NVMe only): no
\ No newline at end of file