diff --git a/config/alfresco/avm-services-context.xml b/config/alfresco/avm-services-context.xml
index 71b53eae65..30f24286f4 100644
--- a/config/alfresco/avm-services-context.xml
+++ b/config/alfresco/avm-services-context.xml
@@ -6,8 +6,7 @@
 
 	<!-- ID Issuers. -->
 	
-	<bean id="nodeIssuer" class="org.alfresco.repo.avm.Issuer"
-		depends-on="avmDAOs" init-method="init">
+	<bean id="nodeIssuer" class="org.alfresco.repo.avm.Issuer" depends-on="avmDAOs" >
 		<property name="name">
 			<value>node</value>
 		</property>
@@ -16,8 +15,7 @@
 		</property>
 	</bean>
 
-	<bean id="layerIssuer" class="org.alfresco.repo.avm.Issuer"
-		depends-on="avmDAOs" init-method="init">
+	<bean id="layerIssuer" class="org.alfresco.repo.avm.Issuer" depends-on="avmDAOs" >
 		<property name="name">
 			<value>layer</value>
 		</property>
diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 1d9f58fa79..a360122959 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -49,6 +49,16 @@
          </list>
       </property>
    </bean>
+   
+   <!-- Bootstrap the AVM -->
+   <bean id="avmBootstrap" class="org.alfresco.repo.avm.AvmBootstrap" >
+      <property name="issuers">
+         <list>
+            <ref bean="nodeIssuer" />
+            <ref bean="layerIssuer" />
+         </list>
+      </property>
+   </bean>
 
 	<!-- Bootstrap Files -->
 
diff --git a/config/alfresco/hibernate-context.xml b/config/alfresco/hibernate-context.xml
index 013d83a6aa..22b3444c45 100644
--- a/config/alfresco/hibernate-context.xml
+++ b/config/alfresco/hibernate-context.xml
@@ -31,7 +31,7 @@
     </bean>
     <bean id="sessionFactoryBase" abstract="true">
         <property name="schemaUpdate">
-           <value>true</value>
+           <value>false</value>
         </property>
         <property name="mappingResources">
             <list>
@@ -58,7 +58,7 @@
                 <!--       from elsewhere -->
                 <!--  -->
                 <value>org/jbpm/graph/action/Script.hbm.xml</value>
-			    <value>org/jbpm/db/hibernate.queries.hbm.xml</value>
+                <value>org/jbpm/db/hibernate.queries.hbm.xml</value>
                 <value>org/jbpm/graph/def/ProcessDefinition.hbm.xml</value>
                 <value>org/jbpm/graph/def/Node.hbm.xml</value>
                 <value>org/jbpm/graph/def/Transition.hbm.xml</value>
diff --git a/source/java/org/alfresco/repo/avm/AvmBootstrap.java b/source/java/org/alfresco/repo/avm/AvmBootstrap.java
new file mode 100644
index 0000000000..07e18f7459
--- /dev/null
+++ b/source/java/org/alfresco/repo/avm/AvmBootstrap.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2006 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.repo.avm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.util.AbstractLifecycleBean;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * This component ensures that the AVM system is properly bootstrapped
+ * and that this is done in the correct order relative to other
+ * bootstrap components.
+ * 
+ * @see #setIssuers(List)
+ * @see org.alfresco.repo.avm.Issuer
+ * 
+ * @author Derek Hulley
+ */
+public class AvmBootstrap extends AbstractLifecycleBean
+{
+    private List<Issuer> issuers;
+    
+    public AvmBootstrap()
+    {
+        issuers = new ArrayList<Issuer>(0);
+    }
+
+    /**
+     * Provide a list of {@link Issuer issuers} to bootstrap on context initialization.
+     * 
+     * @see #onBootstrap(ApplicationEvent)
+     */
+    public void setIssuers(List<Issuer> issuers)
+    {
+        this.issuers = issuers;
+    }
+
+    /**
+     * Initialize the issuers.
+     */
+    @Override
+    protected void onBootstrap(ApplicationEvent event)
+    {
+        for (Issuer issuer : issuers)
+        {
+            issuer.initialize();
+        }
+    }
+
+    /** NO-OP */
+    @Override
+    protected void onShutdown(ApplicationEvent event)
+    {
+        // Nothing
+    }
+}
diff --git a/source/java/org/alfresco/repo/avm/Issuer.java b/source/java/org/alfresco/repo/avm/Issuer.java
index 712ab3d24f..5be23d095a 100644
--- a/source/java/org/alfresco/repo/avm/Issuer.java
+++ b/source/java/org/alfresco/repo/avm/Issuer.java
@@ -65,7 +65,7 @@ public class Issuer
     /**
      * After the database is up, get our value.
      */
-    public void init()
+    public void initialize()
     {
         class TxnWork implements TransactionUtil.TransactionWork<Long>
         {