diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c8ac23dcb..efec37629 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
       with:
         timeout_minutes: 30
         max_attempts: 3
-        command: mvn -B test -Dtest=!Record*
+        command: mvn -B test -Dtest=!Docker*,!Record*
     - name: Run tests on Windows
       if: matrix.os == 'windows-latest'
       uses: nick-fields/retry@v2.9.0
diff --git a/src/main/java/io/github/bonigarcia/wdm/docker/DockerService.java b/src/main/java/io/github/bonigarcia/wdm/docker/DockerService.java
index 0e0339302..573e9c4c2 100644
--- a/src/main/java/io/github/bonigarcia/wdm/docker/DockerService.java
+++ b/src/main/java/io/github/bonigarcia/wdm/docker/DockerService.java
@@ -670,7 +670,10 @@ public DockerContainer startBrowserContainer(String dockerImage,
 
         String containerId = startContainer(browserContainer);
         browserContainer.setContainerId(containerId);
-        String browserHost = getHost(containerId, network);
+        String gateway = getGateway(containerId, network);
+        browserContainer.setGateway(gateway);
+        String browserHost = isHost(network) ? gateway
+                : getHost(containerId, network);
         String browserPort = isHost(network) ? dockerBrowserPort
                 : getBindPort(containerId, dockerBrowserPort + "/tcp");
         String browserUrlFormat = "http://%s:%s/";
@@ -680,8 +683,6 @@ public DockerContainer startBrowserContainer(String dockerImage,
 
         String browserUrl = format(browserUrlFormat, browserHost, browserPort);
         browserContainer.setContainerUrl(browserUrl);
-        String gateway = getGateway(containerId, network);
-        browserContainer.setGateway(gateway);
         String address = getAddress(containerId, network);
         browserContainer.setAddress(address);
         log.trace("Browser remote URL {}", browserUrl);
@@ -725,7 +726,7 @@ public DockerContainer startRecorderContainer(String dockerImage,
 
         // envs
         List<String> envs = new ArrayList<>();
-        String browserAddress = isHost(network) ? DockerHost.DEFAULT_ADDRESS
+        String browserAddress = isHost(network) ? browserContainer.getGateway()
                 : browserContainer.getAddress();
         envs.add("BROWSER_CONTAINER_NAME=" + browserAddress);
         Path recordingPath = getRecordingPath(browserContainer);