diff --git a/.github/workflows/integration-test-cluster-neo4j-5.yml b/.github/workflows/integration-test-cluster-neo4j-5.yml
index 1dcaa958..e6765bf3 100644
--- a/.github/workflows/integration-test-cluster-neo4j-5.yml
+++ b/.github/workflows/integration-test-cluster-neo4j-5.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CONNECTION: neo4j://neo4j:testtest@localhost:7687
-    name: "Running on PHP 8.1 with a Neo4j 5.20-enterprise cluster"
+    name: "Running on PHP 8.1 with a Neo4j 5.10-enterprise cluster"
 
     steps:
       - uses: actions/checkout@v2
@@ -27,6 +27,8 @@ jobs:
           progress: yes
           php_version: 8.1
           version: 2
+      - name: Wait for 60 seconds for Neo4j cluster to start
+        run: echo "Sleeping for 60 seconds" && sleep 60
       - uses: php-actions/phpunit@v3
         with:
           configuration: phpunit.xml.dist
@@ -38,7 +40,7 @@ jobs:
 
     services:
       server1:
-        image: neo4j:5.20-enterprise
+        image: neo4j:5.10-enterprise
         ports:
           - 7687:7687
           - 7473:7473
@@ -47,19 +49,19 @@ jobs:
           NEO4J_initial_server_mode__constraint: PRIMARY
           NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
-          NEO4j_server_bolt_advertised_address: localhost:7687
-          NEO4j_server_http_advertised_address: localhost:7474
+          NEO4J_server_bolt_advertised__address: localhost:7687
+          NEO4J_server_http_advertised__address: localhost:7474
           NEO4J_PLUGINS: '["apoc"]'
           NEO4J_AUTH: neo4j/testtest
         options: >-
           --hostname server1
-          --health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
+          --health-cmd "wget --no-verbose --tries=1 --spider localhost:7474 || exit 1"
           --health-start-period "60s"
           --health-interval "30s"
           --health-timeout "15s"
           --health-retries "5"
       server2:
-        image: neo4j:5.20-enterprise
+        image: neo4j:5.10-enterprise
         ports:
           - 8687:7687
           - 8473:7473
@@ -68,19 +70,19 @@ jobs:
           NEO4J_initial_server_mode__constraint: PRIMARY
           NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
-          NEO4j_server_bolt_advertised_address: localhost:8687
-          NEO4j_server_http_advertised_address: localhost:8474
+          NEO4J_server_bolt_advertised__address: localhost:8687
+          NEO4J_server_http_advertised__address: localhost:8474
           NEO4J_PLUGINS: '["apoc"]'
           NEO4J_AUTH: neo4j/testtest
         options: >-
           --hostname server2
-          --health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
+          --health-cmd "wget --no-verbose --tries=1 --spider localhost:7474 || exit 1"
           --health-start-period "60s"
           --health-interval "30s"
           --health-timeout "15s"
           --health-retries "5"
       server3:
-        image: neo4j:5.20-enterprise
+        image: neo4j:5.10-enterprise
         ports:
           - 9474:7474
           - 9473:7473
@@ -89,19 +91,19 @@ jobs:
           NEO4J_initial_server_mode__constraint: PRIMARY
           NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
-          NEO4j_server_bolt_advertised_address: localhost:9687
-          NEO4j_server_http_advertised_address: localhost:9474
+          NEO4J_server_bolt_advertised__address: localhost:9687
+          NEO4J_server_http_advertised__address: localhost:9474
           NEO4J_PLUGINS: '["apoc"]'
           NEO4J_AUTH: neo4j/testtest
         options: >-
           --hostname server3
-          --health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
+          --health-cmd "wget --no-verbose --tries=1 --spider localhost:7474 || exit 1"
           --health-start-period "60s"
           --health-interval "30s"
           --health-timeout "15s"
           --health-retries "5"
       read-server4:
-        image: neo4j:5.20-enterprise
+        image: neo4j:5.10-enterprise
         ports:
           - 10474:7474
           - 10473:7473
@@ -110,13 +112,13 @@ jobs:
           NEO4J_initial_server_mode__constraint: SECONDARY
           NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
-          NEO4j_server_bolt_advertised_address: localhost:10687
-          NEO4j_server_http_advertised_address: localhost:10474
+          NEO4J_server_bolt_advertised__address: localhost:10687
+          NEO4J_server_http_advertised__address: localhost:10474
           NEO4J_PLUGINS: '["apoc"]'
           NEO4J_AUTH: neo4j/testtest
         options: >-
           --hostname read-server4
-          --health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
+          --health-cmd "wget --no-verbose --tries=1 --spider localhost:7474 || exit 1"
           --health-start-period "60s"
           --health-interval "30s"
           --health-timeout "15s"
diff --git a/docker-compose.yml b/docker-compose.yml
index 6dbf3a8e..4345a7a8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,8 +61,8 @@ services:
       - "11474:7474"
     environment:
       <<: *common-env
-      NEO4j_server_bolt_advertised_address: localhost:11687
-      NEO4j_server_http_advertised_address: localhost:11474
+      NEO4J_server_bolt_advertised__address: localhost:11687
+      NEO4J_server_http_advertised__address: localhost:11474
 
   server1:
     <<: *common-cluster
@@ -73,8 +73,8 @@ services:
       - "7474:7474"
     environment:
       <<: *common-core-env
-      NEO4j_server_bolt_advertised_address: localhost:7687
-      NEO4j_server_http_advertised_address: localhost:7474
+      NEO4J_server_bolt_advertised__address: localhost:7687
+      NEO4J_server_http_advertised__address: localhost:7474
 
   server2:
     <<: *common-cluster
@@ -85,8 +85,8 @@ services:
       - "8474:7474"
     environment:
       <<: *common-core-env
-      NEO4j_server_bolt_advertised_address: localhost:8687
-      NEO4j_server_http_advertised_address: localhost:8474
+      NEO4J_server_bolt_advertised__address: localhost:8687
+      NEO4J_server_http_advertised__address: localhost:8474
 
   server3:
     <<: *common-cluster
@@ -97,8 +97,8 @@ services:
       - "9687:7687"
     environment:
       <<: *common-core-env
-      NEO4j_server_bolt_advertised_address: localhost:9687
-      NEO4j_server_http_advertised_address: localhost:9474
+      NEO4J_server_bolt_advertised__address: localhost:9687
+      NEO4J_server_http_advertised__address: localhost:9474
 
   server4:
     <<: *common-cluster
@@ -110,5 +110,5 @@ services:
     environment:
       <<: *common-cluster-env
       NEO4J_initial_server_mode__constraint: 'SECONDARY'
-      NEO4j_server_bolt_advertised_address: localhost:10687
-      NEO4j_server_http_advertised_address: localhost:10474
+      NEO4J_server_bolt_advertised__address: localhost:10687
+      NEO4J_server_http_advertised__address: localhost:10474