diff --git a/AcmeCaPlugin/AcmeCaPlugin.cs b/AcmeCaPlugin/AcmeCaPlugin.cs
index b1f8553..1c3d432 100644
--- a/AcmeCaPlugin/AcmeCaPlugin.cs
+++ b/AcmeCaPlugin/AcmeCaPlugin.cs
@@ -321,10 +321,14 @@ private static string ExtractDomainFromSubject(string subject)
             if (string.IsNullOrWhiteSpace(subject))
                 throw new ArgumentException("Subject cannot be null or empty", nameof(subject));
 
-            return subject
-                .Replace("CN=", "", StringComparison.OrdinalIgnoreCase)
-                .Replace("cn=", "", StringComparison.OrdinalIgnoreCase)
-                .Trim();
+            // Match CN=value (capturing everything until comma or end of string)
+            var match = Regex.Match(subject, @"CN=([^,]+)", RegexOptions.IgnoreCase);
+            if (match.Success)
+            {
+                return match.Groups[1].Value.Trim();
+            }
+
+            throw new ArgumentException($"Could not extract CN from subject: {subject}", nameof(subject));
         }
 
         /// <summary>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4709a5..ebb90b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
-# v1.0.1
+# v1.0.2
+* Fix DNS issue when fields outside domain are in the subject
+  
+ # v1.0.1
 * Added build for `.net8`
 
 # v1.0.0