diff --git a/Dockerfile b/Dockerfile
index f73c712..dd8e346 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Arguments
-ARG NODE_TAG=14.18.2
-ARG PYBRICKSCODE_TAG=v1.2.0-beta.1
+ARG NODE_TAG=16.13.1
+ARG PYBRICKSCODE_TAG=v2.0.0-beta.1
 
 # Build stage
 FROM node:${NODE_TAG} AS build-stage
diff --git a/docker-compose.build.yml b/docker-compose.build.yml
index 6c14b0b..1e13c54 100644
--- a/docker-compose.build.yml
+++ b/docker-compose.build.yml
@@ -6,8 +6,8 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        NODE_TAG: ${NODE_TAG:-14.18.2}
-        PYBRICKSCODE_TAG: ${PYBRICKSCODE_TAG:-v1.2.0-beta.1}
+        NODE_TAG: ${NODE_TAG:-16.13.1}
+        PYBRICKSCODE_TAG: ${PYBRICKSCODE_TAG:-v2.0.0-beta.1}
     restart: ${RESTART:-unless-stopped}
     healthcheck:
       test: curl -f http://localhost:80/ || exit 1
diff --git a/docker-compose.yml b/docker-compose.yml
index 43381a7..f7aec96 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   # Pybricks Code
   pybrickscode:
     container_name: ${PYBRICKSCODE_CONTAINER_NAME:-PybricksCode}
-    image: axchrono/pybrickscode:${PYBRICKSCODE_TAG:-v1.2.0-beta.1}
+    image: axchrono/pybrickscode:${PYBRICKSCODE_TAG:-v2.0.0-beta.1}
     restart: ${RESTART:-unless-stopped}
     healthcheck:
       test: curl -f http://localhost:80/ || exit 1