diff --git a/distribution/ddf-catalog/pom.xml b/distribution/ddf-catalog/pom.xml
index a6ab50fccb7..2776143a26b 100644
--- a/distribution/ddf-catalog/pom.xml
+++ b/distribution/ddf-catalog/pom.xml
@@ -90,6 +90,7 @@
                                 <descriptor>mvn:ddf.features/apps/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/branding/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/security/${project.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.shiro/shiro-features/${apache.shiro.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/solr/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/utilities/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.catalog/catalog-app/${project.version}/xml/features</descriptor>
diff --git a/distribution/ddf/pom.xml b/distribution/ddf/pom.xml
index 6ddf3b6668b..5dfcc684ac8 100644
--- a/distribution/ddf/pom.xml
+++ b/distribution/ddf/pom.xml
@@ -78,6 +78,7 @@
                                 <descriptor>mvn:ddf.features/admin/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/branding/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/security/${project.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.shiro/shiro-features/${apache.shiro.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/solr/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/utilities/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.catalog/catalog-app/${project.version}/xml/features</descriptor>
diff --git a/features/security/src/main/feature/feature.xml b/features/security/src/main/feature/feature.xml
index 034dd10dbbe..f06a614839c 100644
--- a/features/security/src/main/feature/feature.xml
+++ b/features/security/src/main/feature/feature.xml
@@ -17,6 +17,7 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
 
     <repository>mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features</repository>
+    <repository>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</repository>
     <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
     <repository>mvn:ddf.features/kernel/${project.version}/xml/features</repository>
     <repository>mvn:ddf.features/utilities/${project.version}/xml/features</repository>
@@ -30,8 +31,24 @@
         <feature>pax-web-http-whiteboard</feature>
         <feature>pax-web-jetty-websockets</feature>
         <feature>scr</feature>
+        <feature>spifly</feature>
         <feature version="${spring.feature.version}">spring</feature>
 
+        <!-- Shiro core bundles -->
+        <bundle dependency="true">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.commons/commons-configuration2/${commons-configuration2.version}</bundle>
+        <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.3_spec/${geronimo-annotation.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.shiro/shiro-lang/${apache.shiro.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.shiro/shiro-cache/${apache.shiro.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.shiro/shiro-config-ogdl/${apache.shiro.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.shiro/shiro-crypto-core/${apache.shiro.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.shiro/shiro-crypto-cipher/${apache.shiro.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.shiro/shiro-crypto-hash/${apache.shiro.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.shiro/shiro-config-core/${apache.shiro.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.shiro/shiro-event/${apache.shiro.version}</bundle>
+        <bundle>mvn:org.apache.shiro/shiro-core/${apache.shiro.version}</bundle>
+
         <!-- External DDF Features -->
         <feature version="${project.version}">jackson</feature>
         <feature>wss4j</feature>
@@ -52,7 +69,6 @@
         <bundle>mvn:net.minidev/json-smart/${json-smart.version}</bundle>
 
         <!-- Miscellaneous -->
-        <bundle dependency="true">mvn:org.apache.shiro/shiro-core/${apache.shiro.version}</bundle>
         <bundle>mvn:com.sun.mail/jakarta.mail/${jakarta.mail.version}</bundle>
         <bundle>mvn:org.apache.commons/commons-text/${commons-text.version}</bundle>
 
diff --git a/pom.xml b/pom.xml
index 4b74ed65ef7..22de1d0e3a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
         <abdera.osgi.version>1.1.3_2</abdera.osgi.version>
         <abdera.version>1.1.3</abdera.version>
         <antlr.version>4.3</antlr.version>
-        <apache.shiro.version>1.13.0</apache.shiro.version>
+        <apache.shiro.version>2.2.1</apache.shiro.version>
         <asm.version>9.9.1</asm.version>
         <awaitility.version>3.1.6</awaitility.version>
         <bouncy.version>1.84</bouncy.version>
@@ -166,7 +166,7 @@
         <commons-collections.version>3.2.2</commons-collections.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <commons-configuration.version>1.10</commons-configuration.version>
-        <commons-configuration2.version>2.10.1</commons-configuration2.version>
+        <commons-configuration2.version>2.15.1</commons-configuration2.version>
         <commons-csv.version>1.4</commons-csv.version>
         <commons-digester.version>1.8.1</commons-digester.version>
         <commons-exec.version>1.3</commons-exec.version>
@@ -193,6 +193,7 @@
         <felix.scr.version>2.1.30</felix.scr.version>
         <geronimo-servlet-api.artifact>geronimo-servlet_3.0_spec</geronimo-servlet-api.artifact>
         <geronimo-servlet-api.group>org.apache.geronimo.specs</geronimo-servlet-api.group>
+        <geronimo-annotation.version>1.1</geronimo-annotation.version>
         <google-http-client.version>1.22.0</google-http-client.version>
         <gml-v_3_1_1-schema.version>1.1.0</gml-v_3_1_1-schema.version>
         <gson.version>2.13.2</gson.version>