diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in
index 3d5d4fab16c..14255c1e7a5 100644
--- a/client/tomcatconf/applicationContext.xml.in
+++ b/client/tomcatconf/applicationContext.xml.in
@@ -688,7 +688,7 @@
     <property name="imageDataStoreMgr" ref="imageStoreProviderMgr"/>
   </bean>
 
-  <bean id="CloudStackPrimaryDataStoreProviderImpl"
+  <bean id="cloudStackPrimaryDataStoreProviderImpl"
         class="org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl"/>
 
   <bean id="dataStoreProviderManager"
@@ -696,7 +696,7 @@
     <property name="providers">
       <list>
         <!--Data Store Providers-->
-        <ref bean="CloudStackPrimaryDataStoreProviderImpl"/>
+        <ref bean="cloudStackPrimaryDataStoreProviderImpl"/>
       </list>
     </property>
   </bean>
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 966faf57078..1fbec61ba66 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -112,7 +112,7 @@
         class="org.apache.cloudstack.storage.datastore.provider.DataStoreProviderManagerImpl">
     <property name="providers">
       <list merge="true">
-        <ref bean="CloudStackPrimaryDataStoreProviderImpl"/>
+        <ref bean="cloudStackPrimaryDataStoreProviderImpl"/>
         <ref local="cloudStackImageStoreProviderImpl"/>
         <ref local="s3ImageStoreProviderImpl"/>
         <ref local="swiftImageStoreProviderImpl"/>
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index e7828e1d2af..ffa62818970 100644
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@ -195,17 +195,24 @@
     </property>
   </bean>
 
-  <!--<bean id="SolidfirePrimaryDataStoreProvider" class="org.apache.cloudstack.storage.datastore.provider.SolidfirePrimaryDataStoreProvider"/>-->
+  <bean id="cloudStackImageStoreProviderImpl"
+        class="org.apache.cloudstack.storage.datastore.provider.CloudStackImageStoreProviderImpl"/>
+  <bean id="s3ImageStoreProviderImpl"
+        class="org.apache.cloudstack.storage.datastore.provider.S3ImageStoreProviderImpl"/>
+  <bean id="swiftImageStoreProviderImpl"
+        class="org.apache.cloudstack.storage.datastore.provider.SwiftImageStoreProviderImpl"/>
+  <bean id="solidFireDataStoreProvider"
+        class="org.apache.cloudstack.storage.datastore.provider.SolidfirePrimaryDataStoreProvider"/>
+
   <!--Storage Providers-->
   <bean id="dataStoreProviderManager"
         class="org.apache.cloudstack.storage.datastore.provider.DataStoreProviderManagerImpl">
     <property name="providers">
       <list merge="true">
-        <ref bean="CloudStackPrimaryDataStoreProviderImpl"/>
-        <ref bean="CloudStackImageStoreProviderImpl"/>
-        <ref bean="S3ImageStoreProviderImpl"/>
-        <ref bean="SwiftImageStoreProviderImpl"/>
-        <!--<ref local="SolidfirePrimaryDataStoreProvider"/>-->
+        <ref bean="cloudStackPrimaryDataStoreProviderImpl"/>
+        <ref bean="cloudStackImageStoreProviderImpl"/>
+        <ref bean="s3ImageStoreProviderImpl"/>
+        <ref bean="solidFireDataStoreProvider"/>
       </list>
     </property>
   </bean>
diff --git a/client/tomcatconf/simulatorComponentContext.xml.in b/client/tomcatconf/simulatorComponentContext.xml.in
index 579ae1b6417..92278a4da8e 100644
--- a/client/tomcatconf/simulatorComponentContext.xml.in
+++ b/client/tomcatconf/simulatorComponentContext.xml.in
@@ -45,7 +45,7 @@
       <!--Override the cloudstack default image store provider to use simulator defined provider-->
       <list>
         <!--Data Store Providers-->
-        <ref bean="CloudStackPrimaryDataStoreProviderImpl"/>
+        <ref bean="cloudStackPrimaryDataStoreProviderImpl"/>
         <ref bean="SimulatorImageStoreProviderImpl"/>
       </list>
     </property>