diff --git a/04_copy_env.sh b/04_copy_env.sh
index 979eeb3..94bef89 100644
--- a/04_copy_env.sh
+++ b/04_copy_env.sh
@@ -1,3 +1,5 @@
 #!/usr/bin/with-contenv bash
 
 printenv >> /etc/R/Renviron.site
+
+printenv >> /home/$USER/.Renviron
diff --git a/05_setup_rsession_parameters.sh b/05_setup_rsession_parameters.sh
index 78e4d87..ca1dc27 100644
--- a/05_setup_rsession_parameters.sh
+++ b/05_setup_rsession_parameters.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bash
 
-echo "session-timeout-minutes=360" >> /etc/rstudio/rsession.conf
-echo "session-disconnected-timeout-minutes=360" >> /etc/rstudio/rsession.conf
+echo "session-timeout-minutes=7200" >> /etc/rstudio/rsession.conf
+echo "session-disconnected-timeout-minutes=1440" >> /etc/rstudio/rsession.conf
 echo "session-quit-child-processes-on-exit=0" >> /etc/rstudio/rsession.conf
 #echo "session-default-working-dir=~" >> /etc/rstudio/rsession.conf
 #echo "session-default-new-project-dir=~" >> /etc/rstudio/rsession.conf
diff --git a/Dockerfile b/Dockerfile
index e7a196f..289929e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,7 +65,7 @@ RUN /rocker_scripts/install_pandoc.sh
 RUN mkdir /workspace
 
 # This part comes from https://github.com/openanalytics/shinyproxy-rstudio-ide-demo/blob/master/Dockerfile
-RUN echo "www-frame-origin=disabled" >> /etc/rstudio/disable_auth_rserver.conf
+RUN echo "www-frame-origin=same" >> /etc/rstudio/disable_auth_rserver.conf
 RUN echo "www-verify-user-agent=0" >> /etc/rstudio/disable_auth_rserver.conf
 
 ADD 03_setup_root_path.sh /etc/cont-init.d/03_setup_root_path.sh