diff --git a/.github/workflows/cmake-macos.yml b/.github/workflows/cmake-macos.yml
index 6abae6bf..c5430a89 100644
--- a/.github/workflows/cmake-macos.yml
+++ b/.github/workflows/cmake-macos.yml
@@ -3,7 +3,7 @@
 
 name: CMake (macOS)
 
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 permissions:
   contents: read
@@ -20,7 +20,7 @@ env:
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: xcode-27
     timeout-minutes: 120
 
     steps:
diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml
index 1d251d76..e6422ea3 100644
--- a/.github/workflows/cmake-windows.yml
+++ b/.github/workflows/cmake-windows.yml
@@ -3,7 +3,7 @@
 
 name: CMake (Windows)
 
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 permissions:
   contents: read
@@ -40,7 +40,7 @@ jobs:
       - name: Install Qt x64
         uses: jurplel/install-qt-action@a9c63c7c123f3069cff414e7e482d95dfa9d8125 # v4.4.1
         with:
-          version: 6.11.2
+          version: 6.12.0
           arch: win64_msvc2022_64
           cache: true
           aqtsource: git+https://github.com/miurahr/aqtinstall.git@16db45a70b5905ad596941b223469bc86a56901e
@@ -53,7 +53,7 @@ jobs:
       - name: Install Qt arm64
         uses: jurplel/install-qt-action@a9c63c7c123f3069cff414e7e482d95dfa9d8125 # v4.4.1
         with:
-          version: 6.11.2
+          version: 6.12.0
           arch: win64_msvc2022_arm64_cross_compiled
           cache: true
           aqtsource: git+https://github.com/miurahr/aqtinstall.git@16db45a70b5905ad596941b223469bc86a56901e
diff --git a/install/English.lproj/Conclusion.html b/install/English.lproj/Conclusion.html
index 36d6385a..25e25052 100644
--- a/install/English.lproj/Conclusion.html
+++ b/install/English.lproj/Conclusion.html
@@ -1,6 +1,7 @@
+<html><head>
 <!-- SPDX-FileCopyrightText: Estonian Information System Authority -->
 <!-- SPDX-License-Identifier: MIT -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
 <p style="margin: 0px; font: 14px 'Lucida Grande'">In order to use ID-card in e-services <b>make sure that the extension is installed and enabled</b>.<br /><ol>
 <li style="margin: 0px; font: 12px 'Lucida Grande'">Open browser</li>
 <li style="margin: 0px; font: 12px 'Lucida Grande'">Go to <b>Extensions</b></li>
diff --git a/install/English.lproj/Welcome.html b/install/English.lproj/Welcome.html
index 0eefda34..c8f0775b 100644
--- a/install/English.lproj/Welcome.html
+++ b/install/English.lproj/Welcome.html
@@ -1,4 +1,5 @@
+<html><head>
 <!-- SPDX-FileCopyrightText: Estonian Information System Authority -->
 <!-- SPDX-License-Identifier: MIT -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
 <p style="margin: 0px; font: 13px 'Lucida Grande'">You will be guided through the steps necessary to install this software.</p></body></html>
\ No newline at end of file
diff --git a/install/cs.lproj/Conclusion.html b/install/cs.lproj/Conclusion.html
index e46a38e4..bc8c2540 100644
--- a/install/cs.lproj/Conclusion.html
+++ b/install/cs.lproj/Conclusion.html
@@ -1,6 +1,7 @@
+<html><head>
 <!-- SPDX-FileCopyrightText: Estonian Information System Authority -->
 <!-- SPDX-License-Identifier: MIT -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
     <p style="margin: 0px; font: 14px 'Lucida Grande'">Abyste mohli používat ID kartu v elektronických službách <b>ujistěte se, že je rozšíření nainstalováno a povoleno</b>.<br /><ol>
     <li style="margin: 0px; font: 12px 'Lucida Grande'">Otevřít prohlížeč</li>
     <li style="margin: 0px; font: 12px 'Lucida Grande'">Přejít na <b>Rozšíření</b></li>
diff --git a/install/cs.lproj/Welcome.html b/install/cs.lproj/Welcome.html
index 2a0583b3..90a3e23e 100644
--- a/install/cs.lproj/Welcome.html
+++ b/install/cs.lproj/Welcome.html
@@ -1,4 +1,5 @@
+<html><head>
 <!-- SPDX-FileCopyrightText: Estonian Information System Authority -->
 <!-- SPDX-License-Identifier: MIT -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
 <p style="margin: 0px; font: 13px 'Lucida Grande'">Provedeme vás kroky nezbytnými k instalaci tohoto softwaru.</p></body></html>
\ No newline at end of file
diff --git a/install/et.lproj/Conclusion.html b/install/et.lproj/Conclusion.html
index 511c1f15..9f31a18a 100644
--- a/install/et.lproj/Conclusion.html
+++ b/install/et.lproj/Conclusion.html
@@ -1,6 +1,7 @@
+<html><head>
 <!-- SPDX-FileCopyrightText: Estonian Information System Authority -->
 <!-- SPDX-License-Identifier: MIT -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
 <p style="margin: 0px; font: 14px 'Lucida Grande'">ID-kaardi kasutamiseks e-teenustes <b>veendu, et laiendus on paigaldatud ning aktiveeritud</b>.<br /><ol>
 <li style="margin: 0px; font: 12px 'Lucida Grande'">Ava veebilehitseja</li>
 <li style="margin: 0px; font: 12px 'Lucida Grande'">Ava menüüst <b>Laiendused</b></li>
diff --git a/install/et.lproj/Welcome.html b/install/et.lproj/Welcome.html
index 3a9536e6..01fdbfc2 100644
--- a/install/et.lproj/Welcome.html
+++ b/install/et.lproj/Welcome.html
@@ -1,4 +1,5 @@
+<html><head>
 <!-- SPDX-FileCopyrightText: Estonian Information System Authority -->
 <!-- SPDX-License-Identifier: MIT -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
 <p style="margin: 0px; font: 13px 'Lucida Grande'">Järgnevad juhised tarkvara installeerimiseks.</p></body></html>
\ No newline at end of file
diff --git a/install/ru.lproj/Conclusion.html b/install/ru.lproj/Conclusion.html
index 8f76eb7e..8e14e242 100644
--- a/install/ru.lproj/Conclusion.html
+++ b/install/ru.lproj/Conclusion.html
@@ -1,6 +1,7 @@
+<html><head>
 <!-- SPDX-FileCopyrightText: Estonian Information System Authority -->
 <!-- SPDX-License-Identifier: MIT -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
 <p style="margin: 0px; font: 14px 'Lucida Grande'">Для использования ID-карты в э-услугах, <b>убедитесь, что расширение установлено и включено</b>.<br /><ol>
 <li style="margin: 0px; font: 12px 'Lucida Grande'">Открой интерет браузер</li>
 <li style="margin: 0px; font: 12px 'Lucida Grande'">Открой в меню <b>Расширения</b></li>
diff --git a/install/ru.lproj/Welcome.html b/install/ru.lproj/Welcome.html
index c75a99ad..1fa0d1ed 100644
--- a/install/ru.lproj/Welcome.html
+++ b/install/ru.lproj/Welcome.html
@@ -1,4 +1,5 @@
+<html><head>
 <!-- SPDX-FileCopyrightText: Estonian Information System Authority -->
 <!-- SPDX-License-Identifier: MIT -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
 <p style="margin: 0px; font: 13px 'Lucida Grande'">Вам будут предложены шаги по установке данного ПО.</p></body></html>
\ No newline at end of file
diff --git a/install/sk.lproj/Conclusion.html b/install/sk.lproj/Conclusion.html
index 8a2587a8..c08fba64 100644
--- a/install/sk.lproj/Conclusion.html
+++ b/install/sk.lproj/Conclusion.html
@@ -1,6 +1,7 @@
+<html><head>
 <!-- SPDX-FileCopyrightText: Estonian Information System Authority -->
 <!-- SPDX-License-Identifier: MIT -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
 <p style="margin: 0px; font: 14px 'Lucida Grande'">Aby ste mohli používať ID kartu v elektronických službách <b>uistite sa, že je rozšírenie nainštalované a povolené</b>.<br /><ol>
 <li style="margin: 0px; font: 12px 'Lucida Grande'">Otvoriť prehliadač</li>
 <li style="margin: 0px; font: 12px 'Lucida Grande'">Prejsť na <b>Rozšírenie</b></li>
diff --git a/install/sk.lproj/Welcome.html b/install/sk.lproj/Welcome.html
index 185bc87e..688cb106 100644
--- a/install/sk.lproj/Welcome.html
+++ b/install/sk.lproj/Welcome.html
@@ -1,4 +1,5 @@
+<html><head>
 <!-- SPDX-FileCopyrightText: Estonian Information System Authority -->
 <!-- SPDX-License-Identifier: MIT -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><br />
 <p style="margin: 0px; font: 13px 'Lucida Grande'">Prevedieme vás krokmi potrebnými na inštaláciu tohto softvéru.</p></body></html>
\ No newline at end of file
diff --git a/lib/libelectronic-id b/lib/libelectronic-id
index c0cbecb5..b2f9ec8f 160000
--- a/lib/libelectronic-id
+++ b/lib/libelectronic-id
@@ -1 +1 @@
-Subproject commit c0cbecb577b1559380d2e6d508cdf81e1101fb99
+Subproject commit b2f9ec8f0d3cb58a134a873c4cc442400e9c0fdc
diff --git a/src/controller/application.cpp b/src/controller/application.cpp
index 5ffc698e..d4df4d78 100644
--- a/src/controller/application.cpp
+++ b/src/controller/application.cpp
@@ -61,7 +61,7 @@ Application::Application(int& argc, char** argv, const QString& name) :
 
     registerMetatypes();
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     menuBar = std::make_unique<QMenuBar>();
     QAction* about = menuBar->addMenu(tr("&File"))->addAction(tr("&About"));
     about->setMenuRole(QAction::AboutRole);
diff --git a/src/controller/application.hpp b/src/controller/application.hpp
index 748ec810..ace94d17 100644
--- a/src/controller/application.hpp
+++ b/src/controller/application.hpp
@@ -9,7 +9,7 @@
 
 #include <stdexcept>
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
 #include <QMenuBar>
 #include <memory>
 #endif
@@ -37,7 +37,7 @@ class Application : public QApplication
     // see class SafariApplication in src/mac/main.mm and WebEidDialog::showAboutPage().
     virtual bool isSafariExtensionContainingApp() { return false; }
     virtual void requestSafariExtensionState() { }
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     void showAbout();
 #endif
     virtual void showSafariSettings() { }
@@ -47,7 +47,7 @@ class Application : public QApplication
 
 private:
     QTranslator* translator;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     std::unique_ptr<QMenuBar> menuBar;
 #endif
 };
diff --git a/src/ui/webeiddialog.cpp b/src/ui/webeiddialog.cpp
index 5eb28784..e3ee2e2b 100644
--- a/src/ui/webeiddialog.cpp
+++ b/src/ui/webeiddialog.cpp
@@ -135,7 +135,7 @@ WebEidDialog::WebEidDialog(QWidget* parent) : WebEidUI(parent), ui(new Private)
         showPinInputWarning(false);
         ui->okButton->setEnabled(ui->pinInput->hasAcceptableInput());
     });
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     // Fix pressing Enter in PIN input field in macOS.
     connect(ui->pinInput, &QLineEdit::returnPressed, ui->okButton, &QPushButton::click);
 #endif