diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 36211b66fb..5442aa739d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
 {
     "name": "WordPress Core Development",
     "dockerComposeFile": "docker-compose.yml",
-    "service": "wordpress",
+    "service": "app",
 	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
     // Features to add to the dev container. More info: https://containers.dev/features.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 8a2b0a11f9..74f63135b2 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.1'
 
 services:
-  wordpress:
+  app:
     image: wordpress
     restart: always
     ports:
@@ -12,11 +12,11 @@ services:
       WORDPRESS_DB_PASSWORD: examplepass
       WORDPRESS_DB_NAME: exampledb
     volumes:
-      - ../src:/var/www/html
+      - ../..:/workspaces:cached
 
   db:
     image: mariadb
-    restart: always
+    restart: unless-stopped
     environment:
       MYSQL_DATABASE: exampledb
       MYSQL_USER: exampleuser
@@ -26,5 +26,4 @@ services:
       - db:/var/lib/mysql
 
 volumes:
-  wordpress:
   db:
diff --git a/.devcontainer/install-tools.sh b/.devcontainer/install-tools.sh
old mode 100644
new mode 100755
index 2347045502..7a52fabe84
--- a/.devcontainer/install-tools.sh
+++ b/.devcontainer/install-tools.sh
@@ -7,5 +7,9 @@ curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.pha
 sudo chmod +x wp-cli.phar
 sudo mv wp-cli.phar /usr/local/bin/wp
 
+echo "Installing chromium..."
+sudo apt-get update
+sudo apt-get -y install --no-install-recommends chromium
+
 # Copy the welcome message
 sudo cp .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
old mode 100644
new mode 100755
index 7e38c008f3..26bdd87d04
--- a/.devcontainer/setup.sh
+++ b/.devcontainer/setup.sh
@@ -2,7 +2,7 @@
 
 set -eux
 
-if [ "${CODESPACE_NAME}" = "" ]; then
+if [ -z ${CODESPACE_NAME+x} ]; then
 	SITE_HOST="http://localhost:8080"
 else
 	SITE_HOST="https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"