diff --git a/examples/sitemesh3/grails-app/conf/application.yml b/examples/sitemesh3/grails-app/conf/application.yml
index 5e4c2d5901..8301026622 100644
--- a/examples/sitemesh3/grails-app/conf/application.yml
+++ b/examples/sitemesh3/grails-app/conf/application.yml
@@ -1,22 +1,10 @@
-server:
-  port: 8081
 info:
   app:
-    name: sitemesh3
-    version: '0.1'
-    grailsVersion: 6.0.0
-dataSource:
-  url: jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
-  driverClassName: org.h2.Driver
-  username: sa
-  password: ''
-  pooled: true
-  jmxExport: true
+    name: '@info.app.name@'
+    version: '@info.app.version@'
+    grailsVersion: '@info.app.grailsVersion@'
 grails:
   profile: web
-  gorm:
-    reactor:
-      events: false
   mime:
     disable:
       accept:
@@ -60,12 +48,3 @@ grails:
         staticparts: none
     default:
       codec: html
-
-hibernate:
-  hbm2ddl:
-    auto: update
-  cache:
-    queries: false
-    use_second_level_cache: false
-    use_query_cache: false
-
diff --git a/examples/sitemesh3/grails-app/init/org/sitemesh/grails/plugins/sitemesh3/Application.groovy b/examples/sitemesh3/grails-app/init/org/sitemesh/grails/plugins/sitemesh3/Application.groovy
index 6501d52405..7663642c2d 100644
--- a/examples/sitemesh3/grails-app/init/org/sitemesh/grails/plugins/sitemesh3/Application.groovy
+++ b/examples/sitemesh3/grails-app/init/org/sitemesh/grails/plugins/sitemesh3/Application.groovy
@@ -3,9 +3,8 @@ package org.sitemesh.grails.plugins.sitemesh3
 import grails.boot.GrailsApp
 import grails.boot.config.GrailsAutoConfiguration
 import groovy.transform.CompileStatic
-import grails.plugins.metadata.*
 
-@PluginSource
+@CompileStatic
 class Application extends GrailsAutoConfiguration {
     static void main(String[] args) {
         GrailsApp.run(Application, args)
diff --git a/examples/sitemesh3/src/integration-test/groovy/SitemeshSpec.groovy b/examples/sitemesh3/src/integration-test/groovy/SitemeshSpec.groovy
index 9a3c1103ad..2f5e70602a 100644
--- a/examples/sitemesh3/src/integration-test/groovy/SitemeshSpec.groovy
+++ b/examples/sitemesh3/src/integration-test/groovy/SitemeshSpec.groovy
@@ -1,10 +1,7 @@
-
-import grails.plugin.geb.ContainerGebConfiguration
 import grails.plugin.geb.ContainerGebSpec
 import grails.testing.mixin.integration.Integration
 
 @Integration
-@ContainerGebConfiguration
 class SitemeshSpec extends ContainerGebSpec {
 
     void "forced layout"() {
@@ -12,7 +9,7 @@ class SitemeshSpec extends ContainerGebSpec {
         browser.go 'demo/index'
 
         then:
-        browser.driver.pageSource.contains('''Do you like BootStrap?''')
+        browser.driver.pageSource.contains('Do you like BootStrap?')
     }
 
     void "decorator chaining"() {
@@ -20,7 +17,7 @@ class SitemeshSpec extends ContainerGebSpec {
         browser.go 'demo/chaining'
 
         then:
-        browser.driver.pageSource.contains('''This is so cool.''')
+        browser.driver.pageSource.contains('This is so cool.')
     }
 
     void "jsp demo"() {
@@ -28,10 +25,10 @@ class SitemeshSpec extends ContainerGebSpec {
         browser.go 'demo/jsp'
 
         then:
-        def container = $('div.container')
+        def container = browser.$('div.container')
         container
 
-        browser.driver.pageSource.contains('''Hello World, I am a JSP page!''')
+        browser.driver.pageSource.contains('Hello World, I am a JSP page!')
     }
 
     void "text"() {