diff --git a/commandline_parser.cpp b/commandline_parser.cpp
index b30b090..3d9023e 100644
--- a/commandline_parser.cpp
+++ b/commandline_parser.cpp
@@ -97,14 +97,28 @@ void CommandLineParser::configure() {
     m_pluginNameOption.setDefaultValue("libCAslave.so");
     m_parser.addOption(m_pluginNameOption);
 
+    m_alwaysDownloadConfigOption.setDefaultValue("false");
+    m_parser.addOption(m_alwaysDownloadConfigOption);
+
+    m_alwaysDownloadDCOption.setDefaultValue("false");
+    m_parser.addOption(m_alwaysDownloadDCOption);
+
+    m_noDownloadOption.setDefaultValue("false");
     m_parser.addOption(m_noDownloadOption);
 
     m_workingDirectoryOption.setDefaultValue("/opt/app/tools/atbupdate/");
     m_parser.addOption(m_workingDirectoryOption);
 
+    m_dryRunOption.setDefaultValue("false");
     m_parser.addOption(m_dryRunOption);
+
+    m_extendedVersionOption.setDefaultValue("false");
     m_parser.addOption(m_extendedVersionOption);
+
+    m_yoctoVersionOption .setDefaultValue("false");
     m_parser.addOption(m_yoctoVersionOption);
+
+    m_yoctoInstallStatusOption .setDefaultValue("false");
     m_parser.addOption(m_yoctoInstallStatusOption);
 }