diff --git a/Dockerfile b/Dockerfile
index 73b41b79..99e19067 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,12 @@
-FROM r-base
-RUN rm /etc/apt/apt.conf.d/default
-RUN apt-get update -y
-RUN apt-get install -y dpkg-dev zlib1g-dev libssl-dev libffi-dev
-RUN apt-get install -y curl libcurl4-openssl-dev
+FROM rocker/r-base:4.2.2
+
+RUN apt-get update && \
+    apt-get -y install libpng-dev \
+        python3 \
+        python3-dev \
+        python3-pip \
+        python3-venv && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
 RUN R -e "install.packages('synapser', repos=c('http://ran.synapse.org', 'http://cran.fhcrc.org'))"
diff --git a/Dockerfile.rstudio b/Dockerfile.rstudio
new file mode 100644
index 00000000..cbfb9cac
--- /dev/null
+++ b/Dockerfile.rstudio
@@ -0,0 +1,18 @@
+# This builds the rstudio docker image
+FROM rocker/rstudio:4.2.2
+
+RUN apt-get update && \
+    apt-get -y install libpng-dev \
+        python3 \
+        python3-dev \
+        python3-pip \
+        python3-venv && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+# Must install synapser as rstudio since we are relying on
+# the rstudio user to login
+USER rstudio
+RUN R -e "install.packages('synapser', repos=c('http://ran.synapse.org', 'http://cran.fhcrc.org'))"
+# when starting the container, it must run as root
+USER root