diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
index 54b28163..49b46ed9 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
@@ -25,8 +25,13 @@ dir.root=${alfresco.data.location}
 # Allowed values are: NONE, AUTO, FULL
 index.recovery.mode=NONE
 # As we run embedded, we set Lucene
+# TODO: Find a better solution for indexing, as buildonly (embedded Lucene) is deprecated and going to be removed soon
+#index.subsystem.name=noindex
+#index.subsystem.name=solr
+#index.subsystem.name=solr4
 index.subsystem.name=buildonly
 
+
 #dir.keystore=.
 #keystore.password=storepassword
 #metadata.password=metapassword