diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 1a4d0f99..b59c6ddd 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -13,15 +13,18 @@ RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
     && rm -f /tmp/reinstall-cmake.sh
 
 RUN sed -i.bak "/^#.*deb-src.*universe$/s/^# //g" /etc/apt/sources.list \
-    && echo "deb https://cloud.r-project.org/bin/linux/ubuntu jammy-cran40/" >> /etc/apt/sources.list \
+    && apt -y update \
+    && apt install -y --no-install-recommends \
+      software-properties-common \
+      subversion \
+      valgrind \
+    && add-apt-repository --enable-source --yes "ppa:marutter/rrutter4.0" \
     && wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | sudo tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc \
-    && apt update \
-    && apt -y install subversion \
     && apt -y build-dep r-base-dev \
     && apt -y install r-base-dev \
-    && apt -y install valgrind \
     && Rscript -e "install.packages('languageserver', repos='https://cran.rstudio.com')" \
-    && Rscript -e "install.packages('httpgd', repos='https://cran.rstudio.com')"
+    && Rscript -e "install.packages('httpgd', repos='https://cran.rstudio.com')" \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN apt install -y shellcheck
 RUN apt install -y ccache
diff --git a/Dockerfile b/Dockerfile
index 93f13364..4913c2a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,14 +11,17 @@ RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
     && rm -f /tmp/reinstall-cmake.sh
 
 RUN sed -i.bak "/^#.*deb-src.*universe$/s/^# //g" /etc/apt/sources.list \
-    && echo "deb https://cloud.r-project.org/bin/linux/ubuntu jammy-cran40/" >> /etc/apt/sources.list \
+    && apt -y update \
+    && apt install -y --no-install-recommends \
+      software-properties-common \
+      subversion \
+    && add-apt-repository --enable-source --yes "ppa:marutter/rrutter4.0" \
     && wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | sudo tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc \
-    && apt update \
-    && apt -y install subversion \
     && apt -y build-dep r-base-dev \
     && apt -y install r-base-dev \
     && Rscript -e "install.packages('languageserver', repos='https://cran.rstudio.com')" \
-    && Rscript -e "install.packages('httpgd', repos='https://cran.rstudio.com')"
+    && Rscript -e "install.packages('httpgd', repos='https://cran.rstudio.com')" \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN apt install shellcheck
 RUN apt install -y ccache