diff --git a/deployment/build.gradle b/deployment/build.gradle
index 3e91f55dc..d25687ef1 100644
--- a/deployment/build.gradle
+++ b/deployment/build.gradle
@@ -30,8 +30,8 @@ tasks.register('license') {
 tasks.register('installDist', Copy) {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     dependsOn(parent.getTasksByName('installDist', true).findAll {
-        // Don't create circular dependency or depend on built in openremote submodule apps
-        it.project != project && !it.project.path.startsWith(":openremote:ui:app")
+        // Don't create circular dependency
+        it.project != project
     })
 
     into("$buildDir")
@@ -48,6 +48,6 @@ tasks.register('installDist', Copy) {
         // Don't include deps baked into the manager docker image
         exclude configurations.managerRuntime.resolvedConfiguration.resolvedArtifacts.collect {it.file.name }
         // Don't include any ui packaged JARs (used for dev purposes only)
-        exclude { (it.file.path.contains(".gradle")  || it.file.path.contains(".m2")) && it.file.path.contains("io.openremote.ui") }
+        exclude { (it.file.path.contains(".gradle") || it.file.path.contains(".m2")) && it.file.path.contains("io/openremote/ui") }
     }
 }