diff --git a/.devcontainer/client.dockerfile b/.devcontainer/client.dockerfile
index bf1b7f7eb..627221931 100644
--- a/.devcontainer/client.dockerfile
+++ b/.devcontainer/client.dockerfile
@@ -1,5 +1,5 @@
 # Update the VARIANT arg in docker-compose.yml to pick a Node version: 10, 12, 14
-ARG VARIANT=14
+ARG VARIANT=18
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
 # Update args in docker-compose.yaml to set the UID/GID of the "node" user.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index b586e73d3..6116ac165 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       dockerfile: server.dockerfile
       args:
         # [Choice] Node.js version: 14, 12, 10
-        VARIANT: 12
+        VARIANT: 18
         # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
         USER_UID: 1000
         USER_GID: 1000
@@ -24,9 +24,9 @@ services:
     environment:
       NODE_ENV: development
       PORT: 3000
+      DB_DATABASE: rssmonster
       DB_USERNAME: rssmonster
       DB_PASSWORD: password
-      DB_DATABASE: rssmonster
       DB_HOSTNAME: db
     ports:
       - 3000:3000
@@ -40,7 +40,7 @@ services:
       dockerfile: client.dockerfile
       args:
         # [Choice] Node.js version: 14, 12, 10
-        VARIANT: 12
+        VARIANT: 18
         # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
         USER_UID: 1000
         USER_GID: 1000
@@ -56,7 +56,9 @@ services:
 
     environment:
       NODE_ENV: development
-      VITE_APP_HOSTNAME: http://app:3000/
+      VITE_VUE_APP_HOSTNAME: http://app:3000/
+      VITE_BASE_URL: /
+      PORT: 8080
 
     # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. 
     # (Adding the "ports" property to this file will not forward from a Codespace.)
@@ -80,4 +82,4 @@ services:
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
 #volumes:
-  #mysql-data:
+  #mysql-data:
\ No newline at end of file
diff --git a/.devcontainer/server.dockerfile b/.devcontainer/server.dockerfile
index df53c7f07..0912c98ee 100644
--- a/.devcontainer/server.dockerfile
+++ b/.devcontainer/server.dockerfile
@@ -1,5 +1,5 @@
 # Update the VARIANT arg in docker-compose.yml to pick a Node version: 10, 12, 14
-ARG VARIANT=12
+ARG VARIANT=18
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
 # Update args in docker-compose.yaml to set the UID/GID of the "node" user.
diff --git a/README.md b/README.md
index 4115e0b57..703b8aabe 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![Azure Static Web Apps](https://github.com/pietheinstrengholt/rssmonster/actions/workflows/azure-static-web-apps.yml/badge.svg)](https://github.com/pietheinstrengholt/rssmonster/actions/workflows/azure-static-web-apps.yml)
 [![Azure Web App](https://github.com/pietheinstrengholt/rssmonster/actions/workflows/azure-web-app-server.yml/badge.svg)](https://github.com/pietheinstrengholt/rssmonster/actions/workflows/azure-web-app-server.yml)
 [![Docker](https://img.shields.io/docker/pulls/pietheinstrengholt/rssmonster.svg)](https://hub.docker.com/r/pietheinstrengholt/rssmonster/builds)
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/pietheinstrengholt/rssmonster)
 
 Copyright (c) 2024 Piethein Strengholt, piethein@strengholt-online.nl