diff --git a/aaa-encrypt-service/pom.xml b/aaa-encrypt-service/pom.xml
index ecd9edb46..598f7f4a1 100644
--- a/aaa-encrypt-service/pom.xml
+++ b/aaa-encrypt-service/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.7</version>
+    <version>13.0.10</version>
     <relativePath/>
   </parent>
 
diff --git a/aaa-password-service/impl/src/main/java/org/opendaylight/aaa/impl/password/service/OSGiPasswordServiceConfigBootstrap.java b/aaa-password-service/impl/src/main/java/org/opendaylight/aaa/impl/password/service/OSGiPasswordServiceConfigBootstrap.java
index e98caab2e..3c6183765 100644
--- a/aaa-password-service/impl/src/main/java/org/opendaylight/aaa/impl/password/service/OSGiPasswordServiceConfigBootstrap.java
+++ b/aaa-password-service/impl/src/main/java/org/opendaylight/aaa/impl/password/service/OSGiPasswordServiceConfigBootstrap.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.aaa.impl.password.service;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.collect.Iterables;
 import java.util.Collection;
@@ -30,22 +32,20 @@
 import org.slf4j.LoggerFactory;
 
 @Beta
-@Component(immediate = true)
+@Component(service = { })
 public final class OSGiPasswordServiceConfigBootstrap
         implements ClusteredDataTreeChangeListener<PasswordServiceConfig> {
     private static final Logger LOG = LoggerFactory.getLogger(OSGiPasswordServiceConfigBootstrap.class);
 
-    @Reference
-    DataBroker dataBroker = null;
-
-    @Reference(target = "(component.factory=" + OSGiPasswordServiceConfig.FACTORY_NAME + ")")
-    ComponentFactory<OSGiPasswordServiceConfig> configFactory = null;
-
+    private final ComponentFactory<OSGiPasswordServiceConfig> configFactory;
     private ListenerRegistration<?> registration;
     private ComponentInstance<?> instance;
 
     @Activate
-    synchronized void activate() {
+    public OSGiPasswordServiceConfigBootstrap(@Reference final DataBroker dataBroker,
+            @Reference(target = "(component.factory=" + OSGiPasswordServiceConfig.FACTORY_NAME + ")")
+            final ComponentFactory<OSGiPasswordServiceConfig> configFactory) {
+        this.configFactory  = requireNonNull(configFactory);
         registration = dataBroker.registerDataTreeChangeListener(
             DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION,
                 InstanceIdentifier.create(PasswordServiceConfig.class)), this);
@@ -77,7 +77,7 @@ public synchronized void onDataTreeChanged(final Collection<DataTreeModification
     @Holding("this")
     private void updateInstance(final PasswordServiceConfig config) {
         if (registration != null) {
-            final ComponentInstance<?> newInstance = configFactory.newInstance(
+            final var newInstance = configFactory.newInstance(
                 OSGiPasswordServiceConfig.props(config != null ? config : new PasswordServiceConfigBuilder().build()));
             if (instance != null) {
                 instance.dispose();
diff --git a/aaa-password-service/pom.xml b/aaa-password-service/pom.xml
index 83c5017db..94a9b6515 100644
--- a/aaa-password-service/pom.xml
+++ b/aaa-password-service/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.7</version>
+    <version>13.0.10</version>
     <relativePath/>
   </parent>
 
diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index 4ecfa0d4a..4d98b56e2 100644
--- a/aaa-shiro/pom.xml
+++ b/aaa-shiro/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.7</version>
+    <version>13.0.10</version>
     <relativePath/>
   </parent>
 
diff --git a/aaa-shiro/repackaged-shiro-jar/pom.xml b/aaa-shiro/repackaged-shiro-jar/pom.xml
index afdc9ef46..ffc054b7e 100644
--- a/aaa-shiro/repackaged-shiro-jar/pom.xml
+++ b/aaa-shiro/repackaged-shiro-jar/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 21e208307..d6a5644e9 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>13.0.7</version>
+      <version>13.0.10</version>
       <relativePath/>
     </parent>
 
diff --git a/docs/pom.xml b/docs/pom.xml
index 10d583e88..f633d5715 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
@@ -116,7 +116,7 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>inject.guice.testutils</artifactId>
-            <version>6.0.4</version>
+            <version>6.0.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -256,11 +256,11 @@
                         <link>https://guava.dev/releases/32.0.1-jre/api/docs/</link>
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.0.7/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/6.0.4/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/11.0.4/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/12.0.3/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/8.0.3/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.0.10/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/6.0.5/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/11.0.5/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/12.0.4/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/8.0.4/</link>
                     </links>
 
                     <!--groups>
diff --git a/features/features-aaa/pom.xml b/features/features-aaa/pom.xml
index cf3425167..165a627d0 100644
--- a/features/features-aaa/pom.xml
+++ b/features/features-aaa/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index 6d07a47c7..335018d0e 100644
--- a/features/odl-aaa-api/pom.xml
+++ b/features/odl-aaa-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>12.0.3</version>
+            <version>12.0.4</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/odl-aaa-cert/pom.xml b/features/odl-aaa-cert/pom.xml
index e9be774c7..44137f431 100644
--- a/features/odl-aaa-cert/pom.xml
+++ b/features/odl-aaa-cert/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>8.0.3</version>
+            <version>8.0.4</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/odl-aaa-cli/pom.xml b/features/odl-aaa-cli/pom.xml
index 976f55140..f32c23f5e 100644
--- a/features/odl-aaa-cli/pom.xml
+++ b/features/odl-aaa-cli/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-aaa-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index 2a2d1d13f..210f3dcf2 100644
--- a/features/odl-aaa-encryption-service/pom.xml
+++ b/features/odl-aaa-encryption-service/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>8.0.3</version>
+                <version>8.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/odl-aaa-password-service/pom.xml b/features/odl-aaa-password-service/pom.xml
index 9dda3b405..b964bcf3f 100644
--- a/features/odl-aaa-password-service/pom.xml
+++ b/features/odl-aaa-password-service/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
@@ -60,14 +60,14 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>12.0.3</version>
+            <version>12.0.4</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>8.0.3</version>
+            <version>8.0.4</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index 03ed3256b..dbf97c225 100644
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index a3750755d..5f7bbdd07 100644
--- a/features/odl-aaa-web/pom.xml
+++ b/features/odl-aaa-web/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>11.0.4</version>
+                <version>11.0.5</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/odl-apache-shiro/pom.xml b/features/odl-apache-shiro/pom.xml
index 7d03a6103..31ba48949 100644
--- a/features/odl-apache-shiro/pom.xml
+++ b/features/odl-apache-shiro/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index 98156b274..4f31ab080 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
diff --git a/karaf/pom.xml b/karaf/pom.xml
index e6d26e412..9051eddc9 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 52b606aec..4f441367d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>12.0.3</version>
+    <version>12.0.4</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>8.0.3</version>
+        <version>8.0.4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/pom.xml b/pom.xml
index 78b15ddc0..f5657c6a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.7</version>
+    <version>13.0.10</version>
     <relativePath/>
   </parent>
 
diff --git a/web/pom.xml b/web/pom.xml
index bf44b0635..6e257731b 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.7</version>
+    <version>13.0.10</version>
     <relativePath/>
   </parent>
 
diff --git a/web/testutils/pom.xml b/web/testutils/pom.xml
index 3ecf66c86..c84bf2ad2 100644
--- a/web/testutils/pom.xml
+++ b/web/testutils/pom.xml
@@ -26,7 +26,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>6.0.4</version>
+        <version>6.0.5</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>