diff --git a/LiamWorkflowActivities/SignSourceFiles.cmd b/LiamWorkflowActivities/SignSourceFiles.cmd
index 07d93a8..f388ee4 100644
--- a/LiamWorkflowActivities/SignSourceFiles.cmd
+++ b/LiamWorkflowActivities/SignSourceFiles.cmd
@@ -4,6 +4,12 @@ setlocal EnableDelayedExpansion
 set "ProductName=C4IT Light Identity Access Management"
 set "SignTool=..\..\Common Code\Tools\signtool.exe"
 set "TimeStamp=http://rfc3161timestamp.globalsign.com/advanced"
+set "SignCertificateSubject=Consulting4IT GmbH"
+set "SignCertificateEmail=info@consulting4it.de"
+
+if defined LIAM_SIGN_CERT_SUBJECT (
+    set "SignCertificateSubject=%LIAM_SIGN_CERT_SUBJECT%"
+)
 
 REM Alle passenden Dateien in einer Variablen sammeln
 set "FileList="
@@ -13,6 +19,11 @@ for %%F in (".\bin\Release\Liam*.dll") do (
 
 REM SignTool mit allen gesammelten Dateien aufrufen
 echo Signing all matching files at once...
-call "%SignTool%" sign /a /tr %TimeStamp% /td SHA256 /fd SHA256 /d "%ProductName%" !FileList!
+echo Expected signer: %SignCertificateSubject% ^<%SignCertificateEmail%^>
+if defined LIAM_SIGN_CERT_THUMBPRINT (
+    call "%SignTool%" sign /sha1 "%LIAM_SIGN_CERT_THUMBPRINT%" /tr %TimeStamp% /td SHA256 /fd SHA256 /d "%ProductName%" !FileList!
+) else (
+    call "%SignTool%" sign /n "%SignCertificateSubject%" /tr %TimeStamp% /td SHA256 /fd SHA256 /d "%ProductName%" !FileList!
+)
 
 pause
diff --git a/LiamWorkflowDiagnostics/SignSourceFiles.cmd b/LiamWorkflowDiagnostics/SignSourceFiles.cmd
index 34e5c7a..31b4ebb 100644
--- a/LiamWorkflowDiagnostics/SignSourceFiles.cmd
+++ b/LiamWorkflowDiagnostics/SignSourceFiles.cmd
@@ -4,6 +4,12 @@ setlocal EnableDelayedExpansion
 set "ProductName=C4IT Light Identity Access Management"
 set "SignTool=..\..\Common Code\Tools\signtool.exe"
 set "TimeStamp=http://rfc3161timestamp.globalsign.com/advanced"
+set "SignCertificateSubject=Consulting4IT GmbH"
+set "SignCertificateEmail=info@consulting4it.de"
+
+if defined LIAM_SIGN_CERT_SUBJECT (
+    set "SignCertificateSubject=%LIAM_SIGN_CERT_SUBJECT%"
+)
 
 set "FileList="
 
@@ -24,6 +30,11 @@ if not defined FileList (
 )
 
 echo Signing all matching files at once...
-call "%SignTool%" sign /a /tr %TimeStamp% /td SHA256 /fd SHA256 /d "%ProductName%" !FileList!
+echo Expected signer: %SignCertificateSubject% ^<%SignCertificateEmail%^>
+if defined LIAM_SIGN_CERT_THUMBPRINT (
+    call "%SignTool%" sign /sha1 "%LIAM_SIGN_CERT_THUMBPRINT%" /tr %TimeStamp% /td SHA256 /fd SHA256 /d "%ProductName%" !FileList!
+) else (
+    call "%SignTool%" sign /n "%SignCertificateSubject%" /tr %TimeStamp% /td SHA256 /fd SHA256 /d "%ProductName%" !FileList!
+)
 
 pause