diff --git a/target/zephyr/Kconfig b/target/zephyr/Kconfig
index 14a9ba45..1e38687a 100755
--- a/target/zephyr/Kconfig
+++ b/target/zephyr/Kconfig
@@ -43,10 +43,12 @@ if MENDER_MCU_CLIENT
 
             config MENDER_SERVER_HOST_US
                 bool "https://hosted.mender.io"
+                select MENDER_NET_CA_CERTIFICATE_TAG_SECONDARY_ENABLED
                 help
                     hosted Mender US
             config MENDER_SERVER_HOST_EU
                 bool "https://eu.hosted.mender.io"
+                select MENDER_NET_CA_CERTIFICATE_TAG_SECONDARY_ENABLED
                 help
                     hosted Mender EU
             config MENDER_SERVER_HOST_ON_PREM
@@ -452,7 +454,7 @@ if MENDER_MCU_CLIENT
 
             config MENDER_NET_CA_CERTIFICATE_TAG_DORMANT
                 int "Dormant CA certificate tag for Server rescue"
-                # the tag is arbirtrarily set to 9
+                # the tag is arbitrarily set to 9
                 default 9
                 depends on MENDER_SERVER_DORMANT_CERTIFICATE
                 help
@@ -460,7 +462,7 @@ if MENDER_MCU_CLIENT
 
             config MENDER_NET_CA_CERTIFICATE_TAG_SECONDARY_ENABLED
                 bool "Enable MENDER_NET_CA_CERTIFICATE_TAG_SECONDARY"
-                default y
+                default n
                 help
                     Enables the secondary CA tag. If this option is enabled, the user must add the two certificates with tls_credential_add
 
@@ -469,7 +471,7 @@ if MENDER_MCU_CLIENT
                 range 0 2
                 default 2
                 help
-                    Peer verification level for TLS connection.
+                    Peer verification level for TLS connection. For testing purposes, set to 0 to skip TLS peer verify
 
         endmenu