diff --git a/mqtt-broker/pom.xml b/mqtt-broker/pom.xml
index 2293b02ff..862820449 100644
--- a/mqtt-broker/pom.xml
+++ b/mqtt-broker/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
         <groupId>io.streamnative.pulsar.handlers</groupId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>4.0.10.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt</artifactId>
diff --git a/mqtt-broker/src/main/java/io/streamnative/pulsar/handlers/mqtt/broker/rest/MQTTAdditionalServlet.java b/mqtt-broker/src/main/java/io/streamnative/pulsar/handlers/mqtt/broker/rest/MQTTAdditionalServlet.java
index 1472a23ee..dd37d580d 100644
--- a/mqtt-broker/src/main/java/io/streamnative/pulsar/handlers/mqtt/broker/rest/MQTTAdditionalServlet.java
+++ b/mqtt-broker/src/main/java/io/streamnative/pulsar/handlers/mqtt/broker/rest/MQTTAdditionalServlet.java
@@ -16,6 +16,7 @@
 import org.apache.pulsar.broker.PulsarService;
 import org.apache.pulsar.broker.web.plugin.servlet.AdditionalServletWithPulsarService;
 import org.apache.pulsar.common.configuration.PulsarConfiguration;
+import org.eclipse.jetty.servlet.ServletHolder;
 
 /**
  * MQTT additional servlet.
@@ -35,8 +36,8 @@ public String getBasePath() {
     }
 
     @Override
-    public Object getServletInstance() {
-        return new MQTTServiceServlet(pulsarService);
+    public ServletHolder getServletHolder() {
+        return new ServletHolder(new MQTTServiceServlet(pulsarService));
     }
 
     @Override
diff --git a/mqtt-broker/src/test/java/io/streamnative/pulsar/handlers/mqtt/broker/impl/PulsarMessageConverterTest.java b/mqtt-broker/src/test/java/io/streamnative/pulsar/handlers/mqtt/broker/impl/PulsarMessageConverterTest.java
index 83babfbda..1fdd13456 100644
--- a/mqtt-broker/src/test/java/io/streamnative/pulsar/handlers/mqtt/broker/impl/PulsarMessageConverterTest.java
+++ b/mqtt-broker/src/test/java/io/streamnative/pulsar/handlers/mqtt/broker/impl/PulsarMessageConverterTest.java
@@ -39,7 +39,7 @@ public void testMqttPayloadReleaseDoesNotReleaseEntry() {
                 .setPublishTime(System.currentTimeMillis());
         ByteBuf metadataAndPayload = Commands.serializeMetadataAndPayload(Commands.ChecksumType.None,
                 metadata, payload);
-        EntryImpl entry = EntryImpl.create(PositionFactory.create(1, 1), metadataAndPayload, 1);
+        EntryImpl entry = EntryImpl.create(PositionFactory.create(1, 1), metadataAndPayload);
         metadataAndPayload.release();
         payload.release();
 
diff --git a/mqtt-common/pom.xml b/mqtt-common/pom.xml
index 707ea52b6..283808de6 100644
--- a/mqtt-common/pom.xml
+++ b/mqtt-common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
         <groupId>io.streamnative.pulsar.handlers</groupId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>4.0.10.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt-common</artifactId>
diff --git a/mqtt-proxy/pom.xml b/mqtt-proxy/pom.xml
index 47fdb6df7..44c009233 100644
--- a/mqtt-proxy/pom.xml
+++ b/mqtt-proxy/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
         <groupId>io.streamnative.pulsar.handlers</groupId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>4.0.10.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt-proxy</artifactId>
diff --git a/pom.xml b/pom.xml
index 3d9a64b9d..6a903ae17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <groupId>io.streamnative.pulsar.handlers</groupId>
     <artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>4.0.10.5</version>
     <name>StreamNative :: Pulsar Protocol Handler :: MoP Parent</name>
     <description>Parent for MQTT on Pulsar implemented using Pulsar Protocol Handler.</description>
 
@@ -51,8 +51,8 @@
         <mockito.version>2.22.0</mockito.version>
         <testng.version>6.14.3</testng.version>
         <awaitility.version>4.0.2</awaitility.version>
-        <pulsar.version>4.0.6.8</pulsar.version>
-        <sn.bom.version>4.0.6.8</sn.bom.version>
+        <pulsar.version>4.0.10.5</pulsar.version>
+        <sn.bom.version>4.0.10.5</sn.bom.version>
         <log4j2.version>2.18.0</log4j2.version>
         <fusesource.client.version>1.16</fusesource.client.version>
         <hivemq.mqtt.client.version>1.2.2</hivemq.mqtt.client.version>
diff --git a/tests/pom.xml b/tests/pom.xml
index dc84b2694..43dac17fe 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
         <groupId>io.streamnative.pulsar.handlers</groupId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>4.0.10.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt-tests</artifactId>