diff --git a/REFERENCE.md b/REFERENCE.md
index f199e3e..8077529 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -58,13 +58,13 @@ The DNS alt names with which the agent certificate should be generated
 
 ##### `custom_attribute`
 
-Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
+Data type: `Optional[Array[Pattern[/[\w\.]+=[\w\.]+/]]]`
 
 This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml
 
 ##### `extension_request`
 
-Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
+Data type: `Optional[Array[Pattern[/\w+=[\w\.]+/]]]`
 
 This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml
 
@@ -120,13 +120,13 @@ The DNS alt names with which the agent certificate should be generated
 
 ##### `custom_attribute`
 
-Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
+Data type: `Optional[Array[Pattern[/[\w\.]+=[\w\.]+/]]]`
 
 This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml
 
 ##### `extension_request`
 
-Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
+Data type: `Optional[Array[Pattern[/\w+=[\w\.]+/]]]`
 
 This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml
 
@@ -182,13 +182,13 @@ The DNS alt names with which the agent certificate should be generated
 
 ##### `custom_attribute`
 
-Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
+Data type: `Optional[Array[Pattern[/[\w\.]+=[\w\.]+/]]]`
 
 This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml
 
 ##### `extension_request`
 
-Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
+Data type: `Optional[Array[Pattern[/\w+=[\w\.]+/]]]`
 
 This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml
 
diff --git a/tasks/init.json b/tasks/init.json
index f9fe4e0..9f8c66a 100644
--- a/tasks/init.json
+++ b/tasks/init.json
@@ -28,11 +28,11 @@
     },
     "custom_attribute": {
       "description": "This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml",
-      "type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
+      "type": "Optional[Array[Pattern[/[\\w\\.]+=[\\w\\.]+/]]]"
     },
     "extension_request": {
       "description": "This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml",
-      "type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
+      "type": "Optional[Array[Pattern[/\\w+=[\\w\\.]+/]]]"
     },
     "puppet_conf_settings": {
       "description": "Puppet conf settings. See https://www.puppet.com/docs/pe/2021.7/installing_nix_and_windows_agents_using_an_install_script.html#customize-install-script for usage instructions",
diff --git a/tasks/linux.json b/tasks/linux.json
index 9be897d..3aa210e 100644
--- a/tasks/linux.json
+++ b/tasks/linux.json
@@ -29,11 +29,11 @@
     },
     "custom_attribute": {
       "description": "This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml",
-      "type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
+      "type": "Optional[Array[Pattern[/[\\w\\.]+=[\\w\\.]+/]]]"
     },
     "extension_request": {
       "description": "This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml",
-      "type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
+      "type": "Optional[Array[Pattern[/\\w+=[\\w\\.]+/]]]"
     },
     "puppet_conf_settings": {
       "description": "Puppet conf settings. See https://www.puppet.com/docs/pe/2021.7/installing_nix_and_windows_agents_using_an_install_script.html#customize-install-script for usage instructions",
diff --git a/tasks/windows.json b/tasks/windows.json
index 2b8a11f..fa22c82 100644
--- a/tasks/windows.json
+++ b/tasks/windows.json
@@ -29,11 +29,11 @@
     },
     "custom_attribute": {
       "description": "This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml",
-      "type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
+      "type": "Optional[Array[Pattern[/[\\w\\.]+=[\\w\\.]+/]]]"
     },
     "extension_request": {
       "description": "This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml",
-      "type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
+      "type": "Optional[Array[Pattern[/\\w+=[\\w\\.]+/]]]"
     },
     "puppet_conf_settings": {
       "description": "Puppet conf settings. See https://www.puppet.com/docs/pe/2021.7/installing_nix_and_windows_agents_using_an_install_script.html#customize-install-script for usage instructions",
diff --git a/tasks/windows.ps1 b/tasks/windows.ps1
index a578e8b..71e8b02 100644
--- a/tasks/windows.ps1
+++ b/tasks/windows.ps1
@@ -36,12 +36,12 @@ Param(
   $Set_Noop,
 
   [Parameter(Mandatory = $False)]
-  [ValidateScript({ $_ -match '\w+=\w+' })]
+  [ValidateScript({ $_ -match '[\w\.]+=[\w\.]+' })]
   [String[]]
   $Custom_Attribute,
 
   [Parameter(Mandatory = $False)]
-  [ValidateScript({ $_ -match '\w+=\w+' })]
+  [ValidateScript({ $_ -match '\w+=[\w\.]+' })]
   [String[]]
   $Extension_Request,