diff --git a/pybricks/.env.sample b/pybricks/.env.sample
index 622cf4b..bf7e44d 100644
--- a/pybricks/.env.sample
+++ b/pybricks/.env.sample
@@ -1,6 +1,6 @@
 # Uncomment and change the following variables if you want to use them.
 #RESTART=unless-stopped
 #PYBRICKSCODE_CONTAINER_NAME=Pybricks Code
-#PYBRICKSCODE_TAG=18
+#PYBRICKSCODE_TAG=latest
 #PYBRICKSCODE_PORT=8000
-#PYBRICKSCODE_BRANCH=master
\ No newline at end of file
+#PYBRICKSCODE_BRANCH=master
diff --git a/pybricks/compose.yml b/pybricks/compose.yml
index 4548da3..7f410b6 100644
--- a/pybricks/compose.yml
+++ b/pybricks/compose.yml
@@ -2,15 +2,9 @@ services:
   # Pybricks Code
   pybrickscode:
     container_name: ${PYBRICKSCODE_CONTAINER_NAME:-PybricksCode}
-    image: node:${PYBRICKSCODE_TAG:-18}
+    image: axchrono/pybrickscode:${PYBRICKSCODE_TAG:-latest}
     restart: ${RESTART:-unless-stopped}
     healthcheck:
-      test: curl -f http://localhost:8000/ || exit 1
-    command: >
-      sh -c "git clone https://github.com/pybricks/pybricks-code -b \"${PYBRICKSCODE_BRANCH:-master}\" && \
-      cd pybricks-code && \
-      yarn install && \
-      yarn build && \
-      ./scripts/serve.py"
+      test: wget --no-verbose --tries=1 --spider http://localhost:80/
     ports:
-      - ${PYBRICKSCODE_PORT:-8000}:8000
+      - ${PYBRICKSCODE_PORT:-80}:80
diff --git a/pybricks/readme.md b/pybricks/readme.md
index e627d49..585d64c 100644
--- a/pybricks/readme.md
+++ b/pybricks/readme.md
@@ -32,14 +32,14 @@ The following variables could be set as an environment varaiables using the .env
 |---|---|---|
 | RESTART | unless-stopped | Choose a restart policy. |
 | PYBRICKSCODE_CONTAINER_NAME | PybricksCode | This is used for the name of the container and the main folder under de docker folder. |
-| PYBRICKSCODE_TAG | 18 | Choose a version tag. This is the tag for Node, not the main software. |
-| PYBRICKSCODE_PORT | 8000 | Default port. |
-| PYBRICKSCODE_BRANCH | master | Github branch or tag for the main software. Possible values are: "v2.1.1" or "v2.2.0-beta.8" |
+| PYBRICKSCODE_TAG | latest | Choose a version tag. |
+| PYBRICKSCODE_PORT | 80 | Default port. |
 
 ## Links
 
 * [Homepage](https://pybricks.com/)
 * [GitHub](https://github.com/pybricks/)
+* [Dockerhub](https://hub.docker.com/r/axchrono/pybrickscode)
 
 ## Disclaimer