diff --git a/build.gradle b/build.gradle
index eac2dfcd3..4af94f713 100644
--- a/build.gradle
+++ b/build.gradle
@@ -77,10 +77,6 @@ allprojects {
             substitute module("org.codehaus.groovy:groovy-all") using module("org.apache.groovy:groovy:$groovyVersion")
         }
 
-        resolutionStrategy.dependencySubstitution {
-            substitute(module("org.codehaus.groovy:groovy-bom:3.0.8")).using(module("org.apache.groovy:groovy-bom:4.0.22"))
-        }
-
         resolutionStrategy.eachDependency { DependencyResolveDetails details ->
             if ((details.requested.group == 'org.codehaus.groovy' || details.requested.group == 'org.apache.groovy') && details.requested.name != 'groovy-bom') {
                 details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: "$groovyVersion")
@@ -330,7 +326,7 @@ subprojects { Project subproject ->
 
                 afterEvaluate {
                     if(isGrails3PluginProject) {
-                        artifact source:"${sourceSets.main.groovy.destinationDirectory}/META-INF/grails-plugin.xml",
+                        artifact source:"${sourceSets.main.groovy.getClassesDirectory().get().getAsFile()}/META-INF/grails-plugin.xml",
                                 classifier:"plugin",
                                 extension:'xml'
                     }
diff --git a/examples/grails3-schema-per-tenant/build.gradle b/examples/grails3-schema-per-tenant/build.gradle
index 063218971..5af62acd5 100644
--- a/examples/grails3-schema-per-tenant/build.gradle
+++ b/examples/grails3-schema-per-tenant/build.gradle
@@ -33,6 +33,15 @@ dependencies {
     testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
 }
 
+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        if ((details.requested.group == 'org.codehaus.groovy')) {
+            details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: "$groovyVersion")
+            details.because "The dependency coordinates are changed in Apache Groovy 4, plus ensure version"
+        }
+    }
+}
+
 tasks.withType(Test) {
     systemProperty "geb.env", System.getProperty('geb.env')
     systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")