diff --git a/avm/res/network/public-ip-address/main.bicep b/avm/res/network/public-ip-address/main.bicep
index fd4d7f1931..8b2bb3d8e7 100644
--- a/avm/res/network/public-ip-address/main.bicep
+++ b/avm/res/network/public-ip-address/main.bicep
@@ -148,7 +148,7 @@ resource publicIpAddress 'Microsoft.Network/publicIPAddresses@2023-09-01' = {
         }
       : null
     idleTimeoutInMinutes: idleTimeoutInMinutes
-    ipTags: []
+    ipTags: null // Note: Requires feature 'Microsoft.Network/AllowBringYourOwnPublicIpAddress' to be registered on the subscription
   }
 }
 
@@ -223,7 +223,7 @@ output name string = publicIpAddress.name
 output resourceId string = publicIpAddress.id
 
 @description('The public IP address of the public IP address resource.')
-output ipAddress string = contains(publicIpAddress.properties, 'ipAddress') ? publicIpAddress.properties.ipAddress : ''
+output ipAddress string = publicIpAddress.properties.?ipAddress ?? ''
 
 @description('The location the resource was deployed into.')
 output location string = publicIpAddress.location
diff --git a/avm/res/network/public-ip-address/main.json b/avm/res/network/public-ip-address/main.json
index 050eecc1b7..9bb75070c4 100644
--- a/avm/res/network/public-ip-address/main.json
+++ b/avm/res/network/public-ip-address/main.json
@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.26.54.24096",
-      "templateHash": "9302080973979138347"
+      "templateHash": "1650798617817777444"
     },
     "name": "Public IP Addresses",
     "description": "This module deploys a Public IP Address.",
@@ -482,7 +482,7 @@
         "publicIPAllocationMethod": "[parameters('publicIPAllocationMethod')]",
         "publicIPPrefix": "[if(not(empty(parameters('publicIpPrefixResourceId'))), createObject('id', parameters('publicIpPrefixResourceId')), null())]",
         "idleTimeoutInMinutes": "[parameters('idleTimeoutInMinutes')]",
-        "ipTags": []
+        "ipTags": null
       }
     },
     "publicIpAddress_lock": {
@@ -590,7 +590,7 @@
       "metadata": {
         "description": "The public IP address of the public IP address resource."
       },
-      "value": "[if(contains(reference('publicIpAddress'), 'ipAddress'), reference('publicIpAddress').ipAddress, '')]"
+      "value": "[coalesce(tryGet(reference('publicIpAddress'), 'ipAddress'), '')]"
     },
     "location": {
       "type": "string",
diff --git a/avm/utilities/pipelines/staticValidation/compliance/module.tests.ps1 b/avm/utilities/pipelines/staticValidation/compliance/module.tests.ps1
index 0d68e957d6..4d5bf8a428 100644
--- a/avm/utilities/pipelines/staticValidation/compliance/module.tests.ps1
+++ b/avm/utilities/pipelines/staticValidation/compliance/module.tests.ps1
@@ -1151,10 +1151,9 @@ Describe 'Governance tests' {
 
     # Identify listed modules
     $startIndex = 0
-    while ($issueTemplateContent[$startIndex] -notmatch '^\s*- "Other, as defined below\.\.\."' -and $startIndex -ne $issueTemplateContent.Length) {
+    while ($issueTemplateContent[$startIndex] -notmatch '^\s*#?\s*\-\s+\"avm\/.+\"' -and $startIndex -ne $issueTemplateContent.Length) {
       $startIndex++
     }
-    $startIndex++ # Go one further than dummy value line
 
     $endIndex = $startIndex
     while ($issueTemplateContent[$endIndex] -match '.*- "avm\/.*' -and $endIndex -ne $issueTemplateContent.Length) {