diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp
index cb1981c42d0..901642d2c06 100644
--- a/src/plugins/mcusupport/mcusupportoptions.cpp
+++ b/src/plugins/mcusupport/mcusupportoptions.cpp
@@ -351,26 +351,43 @@ McuSupportOptions::McuSupportOptions(QObject *parent)
 
     toolchainPackage = armGccPackage;
 
-
-    auto stmPackages = {armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage,
-                        qulPackage};
-    auto nxpPackages = {armGccPackage, evkbImxrt1050SdkPackage, seggerJLinkPackage,
-                        qulPackage};
-    auto desktopPackages = {qulPackage};
-    packages = {armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage,
-                evkbImxrt1050SdkPackage, seggerJLinkPackage, qulPackage};
+    auto stmEvalPackages = {
+        armGccPackage, stm32CubeProgrammerPackage, qulPackage};
+    auto stmEngPackages = {
+        armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage, qulPackage};
+    auto nxpEvalPackages = {
+        armGccPackage, seggerJLinkPackage, qulPackage};
+    auto nxpEngPackages = {
+        armGccPackage, evkbImxrt1050SdkPackage, seggerJLinkPackage, qulPackage};
+    auto desktopPackages = {
+        qulPackage};
+    packages = {
+        armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage, evkbImxrt1050SdkPackage,
+        seggerJLinkPackage, qulPackage};
 
     const QString vendorStm = "STM";
     const QString vendorNxp = "NXP";
     const QString vendorQt = "Qt";
+
     boards.append(new BoardOptions(vendorStm,
-                      "stm32f7508", "CMake/stm32f7508-discovery.cmake", "", stmPackages));
+                                   "stm32f7508",
+                                   "CMake/stm32f7508-discovery.cmake", "", stmEvalPackages));
     boards.append(new BoardOptions(vendorStm,
-                      "stm32f769i", "CMake/stm32f769i-discovery.cmake", "", stmPackages));
+                                   "stm32f769i",
+                                   "CMake/stm32f769i-discovery.cmake", "", stmEvalPackages));
+    boards.append(new BoardOptions(vendorStm,
+                                   "Engineering",
+                                   "CMake/<toolchain file>", "", stmEngPackages));
+
     boards.append(new BoardOptions(vendorNxp,
-                      "evkbimxrt1050", "CMake/evkbimxrt1050-toolchain.cmake", "", nxpPackages));
+                                   "evkbimxrt1050",
+                                   "CMake/evkbimxrt1050-toolchain.cmake", "", nxpEvalPackages));
+    boards.append(new BoardOptions(vendorNxp,
+                                   "Engineering",
+                                   "CMake/<toolchain file>", "", nxpEngPackages));
+
     boards.append(new BoardOptions(vendorQt,
-                      "Desktop", "", "Qt", desktopPackages));
+                                   "Desktop", "", "Qt", desktopPackages));
 
     for (auto package : packages)
         connect(package, &PackageOptions::changed, [this](){
diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp
index e764113f311..62024e376bd 100644
--- a/src/plugins/mcusupport/mcusupportoptionspage.cpp
+++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp
@@ -73,8 +73,10 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(const McuSupportOptions *option
     auto boardComboBox = new QComboBox;
     boardChooserLabel->setBuddy(boardComboBox);
     boardChooserLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
-    boardComboBox->addItems(Utils::transform<QStringList>(m_options->boards, [](BoardOptions *b){
-                                 return b->model();}));
+    boardComboBox->addItems(
+                Utils::transform<QStringList>(m_options->boards, [this](BoardOptions *b){
+                    return m_options->kitName(b);
+                }));
     boardChooserlayout->addWidget(boardComboBox);
     mainLayout->addLayout(boardChooserlayout);
 
@@ -83,6 +85,8 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(const McuSupportOptions *option
     m_packagesLayout = new QFormLayout;
     m_packagesGroupBox->setLayout(m_packagesLayout);
 
+    mainLayout->addStretch(1);
+
     m_statusLabel = new QLabel;
     mainLayout->addWidget(m_statusLabel);
     m_statusLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);