diff --git a/agent/build.gradle b/agent/build.gradle
index ca026c5d0..9e6fe4654 100644
--- a/agent/build.gradle
+++ b/agent/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: "java-library"
 
 dependencies {
-    api resolveProject(":agent")
+    api resolveDependency(":agent")
     api project(":model")
 }
 
diff --git a/gradle.properties b/gradle.properties
index 38f2dc8cd..f717154c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,3 @@
 projectName = custom-project
 projectVersion = 1.0-SNAPSHOT
+openremoteVersion = 0.2.0-SNAPSHOT
diff --git a/manager/build.gradle b/manager/build.gradle
index ad7551d53..0e5e6d63c 100644
--- a/manager/build.gradle
+++ b/manager/build.gradle
@@ -1,7 +1,8 @@
 apply plugin: "java-library"
 
 dependencies {
-    api resolveProject(":container")
+    api resolveDependency(":container")
+    //api resolveDependency(":manager")
     api resolveProject(":manager")
     api project(":agent")
     api project(":model")
diff --git a/model/build.gradle b/model/build.gradle
index 990163931..065f29c2e 100644
--- a/model/build.gradle
+++ b/model/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: "java-library"
 
 dependencies {
-    api resolveProject(":model")
+    api resolveDependency(":model")
 }
 
 task installDist {
diff --git a/openremote b/openremote
index c4bdbf9ad..2f8e5e69f 160000
--- a/openremote
+++ b/openremote
@@ -1 +1 @@
-Subproject commit c4bdbf9ad231e0bfef2f3d92cd9a7a906bd82cce
+Subproject commit 2f8e5e69fff6a652ccbd91a680dfab4b96c57650
diff --git a/test/build.gradle b/test/build.gradle
index bd91b56e2..5d8c6ab9f 100644
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     api project(":manager")
     api project(":model")
     api project(":agent")
-    testImplementation(testFixtures(resolveProject(":test")))
+    testImplementation(testFixtures(resolveDependency(":test")))
 }
 
 tasks.withType(Test) {