diff --git a/playbook/shopfloor-setup/Run-ShopfloorSetup.ps1 b/playbook/shopfloor-setup/Run-ShopfloorSetup.ps1
index 34cf9c7..461b85b 100644
--- a/playbook/shopfloor-setup/Run-ShopfloorSetup.ps1
+++ b/playbook/shopfloor-setup/Run-ShopfloorSetup.ps1
@@ -310,11 +310,14 @@ if (Test-Path -LiteralPath $monitorScript) {
$reEnableTask = 'GE Re-enable Wired NICs'
try {
$script = @'
-$imeLogs = 'C:\ProgramData\Microsoft\IntuneManagementExtension\Logs'
-$remLog = Join-Path $imeLogs 'Autologon_Remediation.log'
-if (-not (Test-Path $remLog)) { exit 0 }
-$content = Get-Content $remLog -Raw -ErrorAction SilentlyContinue
-if ($content -notmatch 'Autologon set for ShopFloor') { exit 0 }
+# Poll for the GE Report-IP Proactive Remediation log file. Its appearance
+# means the Report IP script has fired with WiFi-only IPs (because we
+# disabled wired post-PPKG) - which is the exact moment we want to bring
+# wired back up so Monitor-IntuneProgress can push idx=7 with the
+# DeviceId / QR code before the Intune-triggered LAPS-prompt reboot lands.
+# Extension is .LOG (not .txt) observed in field; match any extension.
+$ip = Get-ChildItem 'C:\Logs\GE_Report_IP_Address*' -ErrorAction SilentlyContinue | Select-Object -First 1
+if (-not $ip) { exit 0 }
# Vendor-agnostic wired-NIC re-enable. NetAdapter "Name" varies wildly
# ("Ethernet", "Ethernet 2", "Network", per-vendor names like "Realtek
diff --git a/playbook/shopfloor-setup/Shopfloor/lib/Monitor-IntuneProgress.ps1 b/playbook/shopfloor-setup/Shopfloor/lib/Monitor-IntuneProgress.ps1
index 727fde8..729681b 100644
--- a/playbook/shopfloor-setup/Shopfloor/lib/Monitor-IntuneProgress.ps1
+++ b/playbook/shopfloor-setup/Shopfloor/lib/Monitor-IntuneProgress.ps1
@@ -229,7 +229,7 @@ function Get-Phase1 {
#
# 1. Re-enable wired NICs as soon as the log lands + state file exists.
# 2. Push idx=7 once DeviceId is captured AND the log exists.
- $reportIpLog = Get-ChildItem -Path 'C:\Logs\GE_Report_IP_Address*.txt' -ErrorAction SilentlyContinue |
+ $reportIpLog = Get-ChildItem -Path 'C:\Logs\GE_Report_IP_Address*' -ErrorAction SilentlyContinue |
Select-Object -First 1
$nicListFile = 'C:\Enrollment\disabled-wired-nics.txt'
if ($reportIpLog -and (Test-Path $nicListFile)) {
@@ -810,7 +810,7 @@ function Format-Snapshot {
# yet, which means the SFLD ConfigurationProfile assignment filter still
# sees a leaked 10.9.100.x IP and Phase 2 won't unblock. Don't call
# registration "done" until Report IP has cleared.
- $reportIpDone = [bool](Get-ChildItem -Path 'C:\Logs\GE_Report_IP_Address*.txt' -ErrorAction SilentlyContinue | Select-Object -First 1)
+ $reportIpDone = [bool](Get-ChildItem -Path 'C:\Logs\GE_Report_IP_Address*' -ErrorAction SilentlyContinue | Select-Object -First 1)
$p1Done = ($Snap.Phase1.AzureAdJoined -and $Snap.Phase1.IntuneEnrolled -and
$Snap.Phase1.EmTaskExists -and $Snap.Phase1.PoliciesBaselineReady -and
$reportIpDone)
diff --git a/webapp/templates/imaging.html b/webapp/templates/imaging.html
index e7cac74..a639951 100644
--- a/webapp/templates/imaging.html
+++ b/webapp/templates/imaging.html
@@ -44,7 +44,11 @@
{% if s.hostname_target %}{{ s.hostname_target }}{% endif %}
{% if s.pctype %}{{ s.pctype }}{% endif %}
{% if s.machinenumber %}#{{ s.machinenumber }}{% endif %}
- {% if s.intune_device_id %}
{{ s.intune_device_id }}{{ s.intune_device_id }}
+
+