diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 89bb57fc..c0e47384 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -89,7 +89,7 @@ jobs:
           - ubuntu-20.04
         container:
           - "ubuntu_node.dockerfile"
-          - "ubuntu_stable_node.dockerfile"
+          - "ubuntu_20.04_node.dockerfile"
         node:
           - 14
         pnpm:
diff --git a/README.md b/README.md
index 3455eaf8..057a9178 100644
--- a/README.md
+++ b/README.md
@@ -180,7 +180,7 @@ Here is an example for using setup_cpp to make a builder image that has the Cpp
 
 ```dockerfile
 #### Base Image
-FROM ubuntu:devel AS base
+FROM ubuntu:22.04 AS base
 
 # add setup_cpp
 WORKDIR "/"
@@ -203,7 +203,7 @@ RUN bash -c 'source ~/.cpprc \
     && make build'
 
 ### Running environment
-# use a distroless image or ubuntu:devel if you wish
+# use a distroless image or ubuntu:22.04 if you wish
 FROM gcr.io/distroless/cc
 # copy the built binaries and their runtime dependencies
 COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
@@ -258,7 +258,7 @@ The following gives an example for setting up a C++ environment inside GitLab pi
 .gitlab-ci.yaml
 
 ```yaml
-image: ubuntu:devel
+image: ubuntu:22.04
 
 stages:
   - test
diff --git a/dev/docker/ubuntu.dockerfile b/dev/docker/ubuntu.dockerfile
index 2bf8a43d..b3d2d0f8 100644
--- a/dev/docker/ubuntu.dockerfile
+++ b/dev/docker/ubuntu.dockerfile
@@ -1,5 +1,5 @@
 #### Base Image
-FROM ubuntu:devel AS base
+FROM ubuntu:22.04 AS base
 
 # add setup_cpp
 WORKDIR "/"
@@ -22,7 +22,7 @@ RUN bash -c 'source ~/.cpprc \
     && make build'
 
 ### Running environment
-# use a distroless image or ubuntu:devel if you wish
+# use a distroless image or ubuntu:22.04 if you wish
 FROM gcr.io/distroless/cc
 # copy the built binaries and their runtime dependencies
 COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
diff --git a/dev/docker/ubuntu_stable_node.dockerfile b/dev/docker/ubuntu_20.04_node.dockerfile
similarity index 100%
rename from dev/docker/ubuntu_stable_node.dockerfile
rename to dev/docker/ubuntu_20.04_node.dockerfile
diff --git a/dev/docker/ubuntu_node.dockerfile b/dev/docker/ubuntu_node.dockerfile
index 1bbd70be..e1255306 100644
--- a/dev/docker/ubuntu_node.dockerfile
+++ b/dev/docker/ubuntu_node.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:devel AS base
+FROM ubuntu:22.04 AS base
 
 RUN apt-get update -qq
 RUN apt-get install -y --no-install-recommends nodejs
@@ -21,7 +21,7 @@ RUN bash -c 'source ~/.cpprc \
     && make build'
 
 ### Running environment
-# use a distroless image or ubuntu:devel if you wish
+# use a distroless image or ubuntu:22.04 if you wish
 FROM gcr.io/distroless/cc
 # copy the built binaries and their runtime dependencies
 COPY --from=builder /home/app/build/my_exe/Release/ /home/app/