diff --git a/modules/runners/templates/start-runner-osx.sh b/modules/runners/templates/start-runner-osx.sh
index a6da66116d..0607873309 100644
--- a/modules/runners/templates/start-runner-osx.sh
+++ b/modules/runners/templates/start-runner-osx.sh
@@ -66,6 +66,9 @@ if [ -z "$token" ]; then
   done
 fi
 
+ami_id=$(curl -f -H "X-aws-ec2-metadata-token: $token" \
+  http://169.254.169.254/latest/meta-data/ami-id)
+
 region=$(curl -f -H "X-aws-ec2-metadata-token: $token" \
   http://169.254.169.254/latest/dynamic/instance-identity/document | jq -r .region)
 echo "Retrieved REGION from AWS API ($region)"
@@ -142,6 +145,10 @@ tee /opt/actions-runner/.setup_info <<EOL
     "group": "Operating System",
     "detail": "Distribution: $info_os $info_ver\nArchitecture: $info_arch"
   },
+  {
+    "group": "Runner Image",
+    "detail": "AMI id: $ami_id"
+  },
   {
     "group": "EC2",
     "detail": "Instance id: $instance_id\nAvailability zone: $availability_zone"
diff --git a/modules/runners/templates/start-runner.ps1 b/modules/runners/templates/start-runner.ps1
index ae2eeff3c9..7cc4c394be 100644
--- a/modules/runners/templates/start-runner.ps1
+++ b/modules/runners/templates/start-runner.ps1
@@ -165,10 +165,20 @@ if ($enable_jit_config -eq "false" -or $agent_mode -ne "ephemeral") {
   Tag-InstanceWithRunnerId
 }
 
+$operatingSystem = Get-CimInstance -ClassName Win32_OperatingSystem
+
 $jsonBody = @(
+    @{
+        group='Operating System'
+        detail="Distribution: $($operatingSystem.Caption)`nVersion: $($operatingSystem.Version)`nArchitecture: $($operatingSystem.OSArchitecture)"
+    },
     @{
         group='Runner Image'
         detail="AMI id: $ami_id"
+    },
+    @{
+        group='EC2'
+        detail="Instance type: $($metadata.instanceType)`nAvailability zone: $($metadata.availabilityZone)"
     }
 )
 ConvertTo-Json -InputObject $jsonBody | Set-Content -Path "$pwd\.setup_info"