diff --git a/README.md b/README.md
index 3cdafc6..6d0f7e5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# R - Docker mod for code-server
+# R - Docker mod for code-server and openvscode-server
 
-This mod adds a R dev environment to code-server, to be installed/updated during container start.
+This mod adds a R dev environment to code-server/openvscode-server, to be installed/updated during container start.
 
 In code-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-r`
 
diff --git a/root/etc/cont-init.d/94-r-src b/root/etc/cont-init.d/94-r-src
new file mode 100644
index 0000000..08c79f0
--- /dev/null
+++ b/root/etc/cont-init.d/94-r-src
@@ -0,0 +1,12 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** Adding r repo ****"
+if ! dpkg -l | grep gnupg > /dev/null; then
+    apt-get update && apt-get install -y gnupg
+fi
+
+if [ ! -f "/etc/apt/sources.list.d/r.list" ]; then
+    curl -s https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | apt-key add -
+    source /etc/lsb-release
+    echo "deb https://cloud.r-project.org/bin/linux/ubuntu ${DISTRIB_CODENAME}-cran40/" > /etc/apt/sources.list.d/r.list
+fi
diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get
new file mode 100644
index 0000000..8e5fe66
--- /dev/null
+++ b/root/etc/cont-init.d/95-apt-get
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+
+if [ -f /usr/bin/apt ]; then
+    apt-get update
+fi
diff --git a/root/etc/cont-init.d/98-r b/root/etc/cont-init.d/98-r
index 862deb5..e92fcd9 100644
--- a/root/etc/cont-init.d/98-r
+++ b/root/etc/cont-init.d/98-r
@@ -1,14 +1,6 @@
 #!/usr/bin/with-contenv bash
 
 echo "**** installing R dev environment ****"
-apt-get install -y --no-install-recommends \
-    dirmngr \
-    software-properties-common \
-    wget
-
-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
-add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/"
-
 apt-get install -y \
     build-essential \
     r-base