diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index fb4425c3e..5f6a9804f 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -296,7 +296,11 @@ jobs:
       - &wait_for_supervisor
         name: Wait for Supervisor to come up
         run: |
-          SUPERVISOR=$(docker inspect --format='{{.NetworkSettings.IPAddress}}' hassio_supervisor)
+          until SUPERVISOR=$(docker inspect --format='{{.NetworkSettings.Networks.hassio.IPAddress}}' hassio_supervisor 2>/dev/null) && \
+                [ -n "$SUPERVISOR" ] && [ "$SUPERVISOR" != "<no value>" ]; do
+            echo "Waiting for network configuration..."
+            sleep 1
+          done
           echo "Waiting for Supervisor API at http://${SUPERVISOR}/supervisor/ping"
           timeout=300
           elapsed=0
diff --git a/tests/fixtures/container_attrs.json b/tests/fixtures/container_attrs.json
index 38ccf5b1d..483f762f3 100644
--- a/tests/fixtures/container_attrs.json
+++ b/tests/fixtures/container_attrs.json
@@ -210,28 +210,14 @@
     }
   },
   "NetworkSettings": {
-    "Bridge": "",
     "SandboxID": "067cd11a63f96d227dcc0f01d3e4f5053c368021becd0b4b2da4f301cfda3d29",
-    "HairpinMode": false,
-    "LinkLocalIPv6Address": "",
-    "LinkLocalIPv6PrefixLen": 0,
+    "SandboxKey": "/var/run/docker/netns/067cd11a63f9",
     "Ports": {
       "1883/tcp": [
         { "HostIp": "0.0.0.0", "HostPort": "1883" },
         { "HostIp": "::", "HostPort": "1883" }
       ]
     },
-    "SandboxKey": "/var/run/docker/netns/067cd11a63f9",
-    "SecondaryIPAddresses": null,
-    "SecondaryIPv6Addresses": null,
-    "EndpointID": "",
-    "Gateway": "",
-    "GlobalIPv6Address": "",
-    "GlobalIPv6PrefixLen": 0,
-    "IPAddress": "",
-    "IPPrefixLen": 0,
-    "IPv6Gateway": "",
-    "MacAddress": "",
     "Networks": {
       "hassio": {
         "IPAMConfig": null,