diff --git a/app/alarm/Readme.md b/app/alarm/Readme.md
index 95e91fedc2..1d61dc27bd 100644
--- a/app/alarm/Readme.md
+++ b/app/alarm/Readme.md
@@ -25,9 +25,9 @@ kafka in `/opt/kafka`.
     cd examples
 
     # Use wget, 'curl -O', or web browser to fetch a recent version of kafka
-    wget https://downloads.apache.org/kafka/3.3.1/kafka_2.13-3.3.1.tgz
-    tar vzxf kafka_2.13-3.3.1.tgz
-    ln -s kafka_2.13-3.3.1 kafka
+    wget https://downloads.apache.org/kafka/3.6.1/kafka_2.13-3.6.1.tgz
+    tar vzxf kafka_2.13-3.6.1.tgz
+    ln -s kafka_2.13-3.6.1 kafka
 
 Check `config/zookeeper.properties` and `config/server.properties`.
 By default these contain settings for keeping data in `/tmp/`, which works for initial tests,
diff --git a/app/alarm/logging-ui/pom.xml b/app/alarm/logging-ui/pom.xml
index 8b503e9519..31c26eae33 100644
--- a/app/alarm/logging-ui/pom.xml
+++ b/app/alarm/logging-ui/pom.xml
@@ -63,5 +63,10 @@
       <artifactId>jackson-datatype-jsr310</artifactId>
       <version>${jackson.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.1</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java
index 0367b3f36d..b6d4849bbe 100644
--- a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java
+++ b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java
@@ -1,6 +1,5 @@
 package org.phoebus.applications.alarm.logging.ui;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/app/alarm/model/pom.xml b/app/alarm/model/pom.xml
index d117bd7883..f11efb84c3 100644
--- a/app/alarm/model/pom.xml
+++ b/app/alarm/model/pom.xml
@@ -37,12 +37,12 @@
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>
-      <version>2.0.0</version>
+      <version>${kafka.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-streams</artifactId>
-      <version>2.0.0</version>
+      <version>${kafka.version}</version>
     </dependency>
     <dependency>
       <groupId>org.phoebus</groupId>
diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml
index ea4f5e146b..0bc47543a7 100644
--- a/dependencies/phoebus-target/pom.xml
+++ b/dependencies/phoebus-target/pom.xml
@@ -282,12 +282,12 @@
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-streams</artifactId>
-      <version>2.0.0</version>
+      <version>${kafka.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>
-      <version>2.0.0</version>
+      <version>${kafka.version}</version>
     </dependency>
 
     <!-- Reactive ('Flow') API used by PV -->
@@ -581,6 +581,12 @@
       <version>1.1.4</version>
     </dependency>
 
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+
     <!-- https://mvnrepository.com/artifact/org.apache.activemq/activemq-client -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
diff --git a/pom.xml b/pom.xml
index 6cf4b237af..568d9e1c7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,7 @@
     <apache.commons.math.version>3.6.1</apache.commons.math.version>
     <junit.version>5.8.2</junit.version>
     <elasticsearch.version>8.2.0</elasticsearch.version>
+    <kafka.version>3.6.1</kafka.version>
     <!--<maven.repo.local>${project.build.directory}/.m2</maven.repo.local> -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/services/alarm-config-logger/pom.xml b/services/alarm-config-logger/pom.xml
index bc21761778..c658d0eca0 100644
--- a/services/alarm-config-logger/pom.xml
+++ b/services/alarm-config-logger/pom.xml
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-streams</artifactId>
-      <version>2.0.0</version>
+      <version>${kafka.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>
-      <version>2.0.0</version>
+      <version>${kafka.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
diff --git a/services/alarm-logger/pom.xml b/services/alarm-logger/pom.xml
index 7f014d6b3f..7007ddef65 100644
--- a/services/alarm-logger/pom.xml
+++ b/services/alarm-logger/pom.xml
@@ -50,12 +50,12 @@
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-streams</artifactId>
-      <version>2.0.0</version>
+      <version>${kafka.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>
-      <version>2.0.0</version>
+      <version>${kafka.version}</version>
     </dependency>
     <dependency>
       <groupId>org.elasticsearch.client</groupId>
diff --git a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java
index 9b7807d574..9878516e7f 100644
--- a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java
+++ b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java
@@ -2,7 +2,10 @@
 
 import static org.phoebus.alarm.logging.AlarmLoggingService.logger;
 
+import java.time.Duration;
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalUnit;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -136,7 +139,7 @@ public void close() {
         Runtime.getRuntime().addShutdownHook(new Thread("streams-" + topic + "-alarm-cmd-shutdown-hook") {
             @Override
             public void run() {
-                streams.close(10, TimeUnit.SECONDS);
+                streams.close(Duration.of(10, ChronoUnit.SECONDS));
                 System.out.println("\nShutting cmd streams Done.");
                 latch.countDown();
             }
diff --git a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java
index b83a7b99a2..73ab6a7cdb 100644
--- a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java
+++ b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java
@@ -2,7 +2,9 @@
 
 import static org.phoebus.alarm.logging.AlarmLoggingService.logger;
 
+import java.time.Duration;
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -126,7 +128,7 @@ public long extract(ConsumerRecord<Object, Object> record, long previousTimestam
         Runtime.getRuntime().addShutdownHook(new Thread("streams-"+topic+"-alarm-messages-shutdown-hook") {
             @Override
             public void run() {
-                streams.close(10, TimeUnit.SECONDS);
+                streams.close(Duration.of(10, ChronoUnit.SECONDS));
                 System.out.println("\nShutting streams Done.");
                 latch.countDown();
             }