diff --git a/ansible/DockerInventory.json b/ansible/DockerInventory.json
index 0966aa191a..d8a93812bb 100644
--- a/ansible/DockerInventory.json
+++ b/ansible/DockerInventory.json
@@ -43,7 +43,7 @@
         "containersCount": 9
     },
     {
-        "name": "dockerhost-azure-ubuntu2204-x64-2",
+        "name": "dockerhost-azure-ubuntu2404-x64-1",
         "ip": "20.83.24.86",
         "containers": [
             {
@@ -66,6 +66,14 @@
                 "nodeName": "test-docker-debian12-x64-4",
                 "port": "32773"
             },
+            {
+                "nodeName": "test-docker-fedora40-x64-1",
+                "port": "32778"
+            },
+            {
+                "nodeName": "test-docker-fedora41-x64-1",
+                "port": "32779"
+            },
             {
                 "nodeName": "test-docker-ubi8-x64-1",
                 "port": "32777"
@@ -81,135 +89,147 @@
             {
                 "nodeName": "test-docker-ubuntu2204-x64-7",
                 "port": "32772"
+            },
+            {
+                "nodeName": "test-docker-ubuntu2410-x64-1",
+                "port": "32780"
             }
         ],
-        "containersCount": 9
+        "containersCount": 12
     },
     {
-        "name": "dockerhost-equinix-ubuntu2004-armv8-1",
-        "ip": "147.75.35.203",
+        "name": "dockerhost-equinix-ubuntu2204-armv8-1",
+        "ip": "139.178.86.243",
         "containers": [
             {
-                "nodeName": "test-docker-alpine319-armv8-2",
-                "port": "32775"
+                "nodeName": "test-docker-alpine319-armv8-1",
+                "port": "2232"
             },
             {
-                "nodeName": "test-docker-alpine319-armv8-4",
-                "port": "32777"
+                "nodeName": "test-docker-alpine319-armv8-3",
+                "port": "32772"
             },
             {
-                "nodeName": "test-docker-amazon2023-armv8l-1",
-                "port": "32779"
+                "nodeName": "test-docker-alpine320-armv8-1",
+                "port": "32777"
             },
             {
-                "nodeName": "test-docker-debian12-armv7l-1",
-                "port": "32778"
+                "nodeName": "test-docker-debian12-armv8l-1",
+                "port": "2231"
             },
             {
-                "nodeName": "test-docker-fedora39-armv8l-1",
-                "port": "2234"
+                "nodeName": "test-docker-fedora40-armv8-1",
+                "port": "32778"
             },
             {
-                "nodeName": "test-docker-sles15-armv8l-1",
-                "port": "2236"
+                "nodeName": "test-docker-fedora41-armv8-1",
+                "port": "32779"
             },
             {
-                "nodeName": "test-docker-ubi9-armv8l-1",
-                "port": "32780"
+                "nodeName": "test-docker-ubi8-armv8-1",
+                "port": "32775"
             },
             {
-                "nodeName": "test-docker-ubuntu1804-armv8l-4",
-                "port": "32774"
+                "nodeName": "test-docker-ubuntu2004-armv7l-4",
+                "port": "2230"
             },
             {
-                "nodeName": "test-docker-ubuntu2004-armv7l-1",
-                "port": "2322"
+                "nodeName": "test-docker-ubuntu2004-armv7l-5",
+                "port": "2229"
             },
             {
-                "nodeName": "test-docker-ubuntu2004-armv7l-2",
-                "port": "2323"
+                "nodeName": "test-docker-ubuntu2004-armv7l-6",
+                "port": "2227"
             },
             {
-                "nodeName": "test-docker-ubuntu2004-armv7l-3",
-                "port": "2332"
+                "nodeName": "test-docker-ubuntu2204-armv8-1",
+                "port": "32769"
             },
             {
-                "nodeName": "test-docker-ubuntu2004-armv8l-1",
+                "nodeName": "test-docker-ubuntu2204-armv8-2",
                 "port": "32770"
             },
             {
-                "nodeName": "test-docker-ubuntu2004-armv8l-2",
-                "port": "32771"
+                "nodeName": "test-docker-ubuntu2404-armv7-2",
+                "port": "32774"
             },
             {
-                "nodeName": "test-docker-ubuntu2204-armv8l-2",
+                "nodeName": "test-docker-ubuntu2404-armv8-1",
                 "port": "32773"
             },
             {
-                "nodeName": "test-docker-ubuntu2310-armv8l-1",
-                "port": "32776"
+                "nodeName": "test-docker-ubuntu2410-armv8-1",
+                "port": "32780"
             }
         ],
         "containersCount": 15
     },
     {
-        "name": "dockerhost-equinix-ubuntu2204-armv8-1",
-        "ip": "139.178.86.243",
+        "name": "dockerhost-equinix-ubuntu2404-armv8-1",
+        "ip": "147.75.35.203",
         "containers": [
             {
-                "nodeName": "test-docker-alpine314-armv8-3",
-                "port": "2214"
+                "nodeName": "test-docker-alpine319-armv8-2",
+                "port": "32775"
             },
             {
-                "nodeName": "test-docker-alpine319-armv8-1",
-                "port": "2232"
+                "nodeName": "test-docker-alpine319-armv8-4",
+                "port": "32777"
             },
             {
-                "nodeName": "test-docker-alpine319-armv8-3",
-                "port": "32772"
+                "nodeName": "test-docker-amazon2023-armv8l-1",
+                "port": "32779"
             },
             {
-                "nodeName": "test-docker-alpine320-armv8-1",
-                "port": "32777"
+                "nodeName": "test-docker-debian12-armv7l-1",
+                "port": "32778"
             },
             {
-                "nodeName": "test-docker-debian12-armv8l-1",
-                "port": "2231"
+                "nodeName": "test-docker-fedora39-armv8l-1",
+                "port": "2234"
             },
             {
-                "nodeName": "test-docker-ubi8-armv8-1",
-                "port": "32775"
+                "nodeName": "test-docker-sles15-armv8l-1",
+                "port": "2236"
             },
             {
-                "nodeName": "test-docker-ubuntu2004-armv7l-4",
-                "port": "2230"
+                "nodeName": "test-docker-ubi9-armv8l-1",
+                "port": "32780"
             },
             {
-                "nodeName": "test-docker-ubuntu2004-armv7l-5",
-                "port": "2229"
+                "nodeName": "test-docker-ubuntu1804-armv8l-4",
+                "port": "32774"
             },
             {
-                "nodeName": "test-docker-ubuntu2004-armv7l-6",
-                "port": "2227"
+                "nodeName": "test-docker-ubuntu2004-armv7l-1",
+                "port": "2322"
             },
             {
-                "nodeName": "test-docker-ubuntu2204-armv8-1",
-                "port": "32769"
+                "nodeName": "test-docker-ubuntu2004-armv7l-2",
+                "port": "2323"
             },
             {
-                "nodeName": "test-docker-ubuntu2204-armv8-2",
+                "nodeName": "test-docker-ubuntu2004-armv7l-3",
+                "port": "2332"
+            },
+            {
+                "nodeName": "test-docker-ubuntu2004-armv8l-1",
                 "port": "32770"
             },
             {
-                "nodeName": "test-docker-ubuntu2404-armv7-2",
-                "port": "32774"
+                "nodeName": "test-docker-ubuntu2004-armv8l-2",
+                "port": "32771"
             },
             {
-                "nodeName": "test-docker-ubuntu2404-armv8-1",
+                "nodeName": "test-docker-ubuntu2204-armv8l-2",
                 "port": "32773"
+            },
+            {
+                "nodeName": "test-docker-ubuntu2310-armv8l-1",
+                "port": "32776"
             }
         ],
-        "containersCount": 13
+        "containersCount": 15
     },
     {
         "name": "dockerhost-marist-ubuntu2204-s390x-1",
@@ -311,10 +331,6 @@
         "name": "dockerhost-skytap-ubuntu2204-x64-1",
         "ip": "20.61.136.254",
         "containers": [
-            {
-                "nodeName": "build-skytap-solaris10-x64-1",
-                "port": "2200"
-            },
             {
                 "nodeName": "test-docker-alpine319-x64-1",
                 "port": "32787"
@@ -328,6 +344,6 @@
                 "port": "32790"
             }
         ],
-        "containersCount": 4
+        "containersCount": 3
     }
 ]
\ No newline at end of file
diff --git a/ansible/inventory.yml b/ansible/inventory.yml
index 64ca14835e..8c29298ee6 100644
--- a/ansible/inventory.yml
+++ b/ansible/inventory.yml
@@ -79,7 +79,7 @@ hosts:
 
       - azure:
           ubuntu2204-x64-1: {ip: 52.180.147.157, description: Xeon Platinum 8272CL, 16 cores, 64GB}
-          ubuntu2204-x64-2: {ip: 20.83.24.86, description: 16 cores, 64GB}
+          ubuntu2404-x64-1: {ip: 20.83.24.86, description: 16 cores, 64GB}
 
       - equinix:
           ubuntu2404-armv8-1: {ip: 147.75.35.203, description: Ampere Altra 160 core, 512Gb}