diff --git a/pom.xml b/pom.xml
index c93f73b..15d8ead 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,9 +13,9 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-    <quarkus.platform.version>2.7.5.Final</quarkus.platform.version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
-    <quarkus-github-app.version>1.8.4</quarkus-github-app.version>
+    <quarkus.platform.version>2.16.6.Final</quarkus.platform.version>
+    <surefire-plugin.version>3.0.0</surefire-plugin.version>
+    <quarkus-github-app.version>1.16.0</quarkus-github-app.version>
 
   </properties>
   <dependencyManagement>
diff --git a/src/main/java/org/bf2/arch/bot/CreateDraftRecordFlow.java b/src/main/java/org/bf2/arch/bot/CreateDraftRecordFlow.java
index e85cfae..ae39c1b 100644
--- a/src/main/java/org/bf2/arch/bot/CreateDraftRecordFlow.java
+++ b/src/main/java/org/bf2/arch/bot/CreateDraftRecordFlow.java
@@ -11,14 +11,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import io.quarkiverse.githubapp.ConfigFile;
-import io.quarkiverse.githubapp.event.IssueComment;
-import org.bf2.arch.bot.model.record.RecordPage;
 import org.bf2.arch.bot.model.record.RecordId;
+import org.bf2.arch.bot.model.record.RecordPage;
 import org.bf2.arch.bot.model.record.RecordType;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.kohsuke.github.GHBranch;
 import org.kohsuke.github.GHCommit;
 import org.kohsuke.github.GHContent;
@@ -32,6 +28,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.quarkiverse.githubapp.ConfigFile;
+import io.quarkiverse.githubapp.event.IssueComment;
+import io.smallrye.common.constraint.NotNull;
+import io.smallrye.common.constraint.Nullable;
+
 /**
  * Flow for creating a Draft record (AP, ADR, PADR), and possibly superseding an existing record.
  *
diff --git a/src/main/java/org/bf2/arch/bot/Util.java b/src/main/java/org/bf2/arch/bot/Util.java
index 0103c7d..048cdc5 100644
--- a/src/main/java/org/bf2/arch/bot/Util.java
+++ b/src/main/java/org/bf2/arch/bot/Util.java
@@ -21,7 +21,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.jetbrains.annotations.NotNull;
 import org.kohsuke.github.GHIssue;
 import org.kohsuke.github.GHLabel;
 import org.kohsuke.github.GHPullRequest;
@@ -30,6 +29,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.smallrye.common.constraint.NotNull;
+
 /**
  * Common helper functions
  */
diff --git a/src/test/java/org/bf2/arch/bot/CreateDraftRecordFlowTest.java b/src/test/java/org/bf2/arch/bot/CreateDraftRecordFlowTest.java
index 9a24c95..dea1f84 100644
--- a/src/test/java/org/bf2/arch/bot/CreateDraftRecordFlowTest.java
+++ b/src/test/java/org/bf2/arch/bot/CreateDraftRecordFlowTest.java
@@ -70,6 +70,8 @@ public void renderTemplateTest() throws IOException {
                 "- \"me\"\n" +
                 "tags:\n" +
                 "- \"bar\"\n" +
+                "applies_padrs: null\n" +
+                "applies_patterns: null\n" +
                 "---\n" +
                 "Hello, world\n", rendered.toContentString());
     }
@@ -92,6 +94,8 @@ public void renderSupersededTemplateTest() throws IOException {
                         "- \"me\"\n" +
                         "tags:\n" +
                         "- \"bar\"\n" +
+                        "applies_padrs: null\n" +
+                        "applies_patterns: null\n" +
                         "---\n" +
                         "Hello, world\n", rendered.toContentString());
     }
@@ -137,4 +141,4 @@ public void testGetPage() throws IOException {
 
     // TODO test supersededContent
 
-}
\ No newline at end of file
+}