diff --git a/smartgears/r_connector/tasks/main.yml b/smartgears/r_connector/tasks/main.yml
index 5f114d8b..edfa2899 100644
--- a/smartgears/r_connector/tasks/main.yml
+++ b/smartgears/r_connector/tasks/main.yml
@@ -110,7 +110,8 @@
 
 - block:
     - name: Reconfigure the Java environment for R
-      shell: export JAVA_HOME=/usr/lib/jvm/java-8-oracle ; export J2SDKDIR=/usr/lib/jvm/java-8-oracle ; export J2REDIR=/usr/lib/jvm/java-8-oracle/jre ; R CMD javareconf
+      shell: export JAVA_HOME={{ jdk_java_home }} ; export J2SDKDIR={{ jdk_java_home ; export J2REDIR={{ jdk_java_home }}/jre ; R CMD javareconf
+      when: jdk_java_home is defined
 
   become: True
   become_user: root