diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
index 93e449814..ff8aa5cfc 100644
--- a/.github/workflows/ci_cd.yml
+++ b/.github/workflows/ci_cd.yml
@@ -5,7 +5,7 @@ on:
   # Push excluding tags and workflow changes
   push:
     branches:
-        - '**'
+      - '**'
     tags-ignore:
       - '*.*'
     paths-ignore:
diff --git a/build.gradle b/build.gradle
index fe73294e5..6aa86bf6c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,6 @@
-
 allprojects {
-    // Apply common project setup but exclude submodule, it has its own build.gradle
-    if (findProject(":openremote") && !path.startsWith(":openremote")) {
-        apply from: "${project(":openremote").projectDir}/project.gradle"
-    } else if (!findProject(":openremote")) {
-        apply from: "${project.rootDir}/project.gradle"
-    }
+    // Apply common project setup
+    apply from: "${project.rootDir}/project.gradle"
 }
 
 // Uncomment the following to configure files to be encrypted/decrypted
@@ -28,7 +23,7 @@ allprojects {
 //        return password.toCharArray()
 //    }
 //}
-//task checkFilesGitIgnoredNew(type: Exec) {
+//tasks.register('checkFilesGitIgnoredNew', Exec) {
 //    // The provided checkFilesGitIgnored task doesn't work on Windows so here's one that does
 //    def args = []
 //    if (org.apache.tools.ant.taskdefs.condition.Os.isFamily(org.apache.tools.ant.taskdefs.condition.Os.FAMILY_WINDOWS)) {
diff --git a/deployment/build.gradle b/deployment/build.gradle
index 18433cd1c..7311c8647 100644
--- a/deployment/build.gradle
+++ b/deployment/build.gradle
@@ -7,9 +7,6 @@ dependencies {
 tasks.register('license') {
     doLast {
         def licenseFiles = new ArrayList<>()
-        if (findProject(":openremote")) {
-            licenseFiles.add("${project(":openremote").projectDir}/LICENSE.txt")
-        }
         licenseFiles.add("${rootDir}/LICENSE.txt")
 
         def toConcatenate = files(licenseFiles.toArray())
diff --git a/gradle.properties b/gradle.properties
index 4737b43c2..273c05617 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,6 +2,9 @@ org.gradle.parallel=true
 
 projectName = custom-project
 projectVersion = 1.0-SNAPSHOT
+
 openremoteVersion = 1.2.0-SNAPSHOT
-typescriptGeneratorVersion = 3.2.1263
+
 jacksonVersion = 2.16.0
+typescriptGeneratorVersion = 3.2.1263
+