diff --git a/Base/Dockerfile b/Base/Dockerfile
index bc378576e..58d1082e9 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20201106
+FROM ubuntu:focal-20210401
 LABEL authors="Selenium <selenium-developers@googlegroups.com>"
 
 #================================================
diff --git a/Makefile b/Makefile
index 844df1829..61ac5fb26 100644
--- a/Makefile
+++ b/Makefile
@@ -371,14 +371,16 @@ release: tag_major_minor
 # video: this should be moved to release_latest when Selenium 4 is released
 
 test: test_chrome \
- test_edge \
  test_firefox \
  test_opera \
  test_chrome_standalone \
- test_edge_standalone \
  test_firefox_standalone \
  test_opera_standalone
 
+# Disabling Edge testing for this release as Dev seems unstable
+#  test_edge \
+#  test_edge_standalone \
+
 
 test_chrome:
 	VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChrome
diff --git a/README.md b/README.md
index 3ad28d52c..152465571 100644
--- a/README.md
+++ b/README.md
@@ -636,7 +636,7 @@ This project uses [noVNC](https://github.com/novnc/noVNC) to allow users inspect
 their browser. This might come handy if you cannot install a VNC client on your machine. Port 7900 is used to start
 noVNC, so you will need to connect to that port with your browser.
 
-Similarly to the previous section, feel free to map port 5900 to any free external port that you wish.
+Similarly to the previous section, feel free to map port 7900 to any free external port that you wish.
 
 Here is an example with the standalone images, the same concept applies to the node images.
 ``` bash
diff --git a/tests/test.py b/tests/test.py
index 8c6524071..c54b09900 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -175,7 +175,7 @@ def launch_container(container, **kwargs):
             prune_networks()
             create_network("grid")
             hub_id = launch_hub("grid")
-            ports = {'5555': 5555}
+            ports = {'5555': 5555, '7900': 7900}
             if use_random_user_id:
                 test_container_id = launch_container(image, network='grid', ports=ports, user=random_user_id)
             else: