diff --git a/Modulefile b/Modulefile
index f4576a5..27856e3 100644
--- a/Modulefile
+++ b/Modulefile
@@ -18,6 +18,7 @@ if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidate
     prereq java/11.0.9
 } else {
     prepend-path PATH $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt/bin
+    setenv JAVA_HOME $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt
 }
 
 if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidates/maven/3.6.3] != 1} { 
diff --git a/coredsl b/coredsl
index 53fe0ec..0f70913 160000
--- a/coredsl
+++ b/coredsl
@@ -1 +1 @@
-Subproject commit 53fe0ec4e74ad03fef6fd5d43976a98cc2e1b2e8
+Subproject commit 0f709131c6a1cd1f663155d5b587d30e34f47c2e
diff --git a/dbt-rise-tgc b/dbt-rise-tgc
index 30ae743..9dfca61 160000
--- a/dbt-rise-tgc
+++ b/dbt-rise-tgc
@@ -1 +1 @@
-Subproject commit 30ae7433611084d85148adbbad199f4f54773166
+Subproject commit 9dfca612b7491ee18695714c26b0df02abdd3981