diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5db37a9..33110b4 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -67,6 +67,7 @@
         <module name="bw-util-deployment" />
         <module name="bw-calsockets-web" />
         <module name="bw-calendar-xsl-calrsrc-SoEDepartmental" />
+        <module name="bw-hawtio4" />
         <module name="bw-cli-toolcmd" />
         <module name="bw-carddav-dumpres" />
         <module name="bw-carddav-server" />
@@ -166,7 +167,6 @@
         <module name="bw-caldav-server" />
         <module name="bw-calendar-annotations" />
         <module name="bw-util-logging" />
-        <module name="bw-hawtio" />
         <module name="bw-util-jmx" />
         <module name="bw-caldavTest" />
         <module name="bw-event-registration-common-war" />
@@ -248,6 +248,7 @@
       <module name="bw-evreg-ear" target="1.7" />
       <module name="bw-evreg-service" target="1.7" />
       <module name="bw-evreg-war" target="1.7" />
+      <module name="bw-hawtio" target="21" />
       <module name="bw-jsforj" target="11" />
       <module name="bw-note-ear" target="11" />
       <module name="bw-opensearch-GeoLite2-City (2)" target="11" />
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 193a52e..84d3066 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -308,6 +308,8 @@
     <file url="file://$PROJECT_DIR$/../bw-quickstart/bw-calendar-data-h2/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/../bw-quickstart/bw-hawtio/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/../bw-quickstart/bw-hawtio/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/../bw-quickstart/bw-hawtio4/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/../bw-quickstart/bw-hawtio4/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/../bw-quickstart/bw-opensearch-GeoLite2-City/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/../bw-quickstart/bw-opensearch-GeoLite2-City/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/../bw-quickstart/bw-opensearch-qs/src/main/java" charset="UTF-8" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6cf1bfd..1e077c2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -102,6 +102,7 @@
         <option value="$PROJECT_DIR$/../bw-dao/pom.xml" />
         <option value="$PROJECT_DIR$/../bw-dav-tester/pom.xml" />
         <option value="$PROJECT_DIR$/../bw-event-registration/bw-event-registration-ear/pom.xml" />
+        <option value="$PROJECT_DIR$/../bw-quickstart/bw-hawtio/pom.xml" />
         <option value="$PROJECT_DIR$/../bw-self-registration/bw-self-registration-ear/pom.xml" />
         <option value="$PROJECT_DIR$/../bw-synch/bw-synch-xml/pom.xml" />
         <option value="$PROJECT_DIR$/../bw-timezone-server/bw-timezone-server-ear/pom.xml" />