diff --git a/master/bt5/vifib_data/LocalRolesTemplateItem/service_module/vifib_software_cleanup.xml b/master/bt5/vifib_data/LocalRolesTemplateItem/service_module/vifib_software_cleanup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6e8abea04ecbb04cbc2011173e32719859b8f14d
--- /dev/null
+++ b/master/bt5/vifib_data/LocalRolesTemplateItem/service_module/vifib_software_cleanup.xml
@@ -0,0 +1,19 @@
+<local_roles_item>
+ <local_roles>
+  <role id='G-COMPANY'>
+   <item>Assignor</item>
+  </role>
+  <role id='R-COMPUTER'>
+   <item>Auditor</item>
+  </role>
+  <role id='R-INSTANCE'>
+   <item>Auditor</item>
+  </role>
+  <role id='R-MEMBER'>
+   <item>Auditor</item>
+  </role>
+  <role id='superluke'>
+   <item>Owner</item>
+  </role>
+ </local_roles>
+</local_roles_item>
\ No newline at end of file
diff --git a/master/bt5/vifib_data/PathTemplateItem/service_module/vifib_software_cleanup.xml b/master/bt5/vifib_data/PathTemplateItem/service_module/vifib_software_cleanup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a7dca9b1bc37852ed8b3575613b46a4b431ae6d8
--- /dev/null
+++ b/master/bt5/vifib_data/PathTemplateItem/service_module/vifib_software_cleanup.xml
@@ -0,0 +1,469 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Service" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Access_contents_information_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Auditor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Add_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_View_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Auditor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>aggregated_portal_type</string> </key>
+            <value>
+              <tuple>
+                <string>Computer</string>
+                <string>Software Release</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>quantity_unit/unit/piece</string>
+                <string>use/trade/purchase</string>
+                <string>base_contribution/base_amount/invoicing/discounted</string>
+                <string>base_contribution/base_amount/invoicing/taxable</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>comment</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>software_cleanup</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>format</string> </key>
+            <value> <string>text/html</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>vifib_software_cleanup</string> </value>
+        </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value> <string>_generatePerDayId</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Service</string> </value>
+        </item>
+        <item>
+            <key> <string>required_aggregated_portal_type</string> </key>
+            <value>
+              <tuple>
+                <string>Computer</string>
+                <string>Software Release</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Software Cleanup</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>edit_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>edit</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>superluke</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>error_message</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>serial</string> </key>
+                <value> <string>0.0.0.0</string> </value>
+            </item>
+            <item>
+                <key> <string>state</string> </key>
+                <value> <string>current</string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global id="3.1" name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1332768172.28</float>
+                        <string>GMT+2</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+          </dictionary>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>edit</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>superluke</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value>
+                  <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+                </value>
+            </item>
+            <item>
+                <key> <string>error_message</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>serial</string> </key>
+                <value> <string>0.0.0.0</string> </value>
+            </item>
+            <item>
+                <key> <string>state</string> </key>
+                <value> <string>current</string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass> <reference id="3.1"/> </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1332768172.29</float>
+                        <string>GMT+2</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+          </dictionary>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>edit</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>superluke</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value>
+                  <none/>
+                </value>
+            </item>
+            <item>
+                <key> <string>error_message</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>serial</string> </key>
+                <value> <string>917.25730.57149.14301</string> </value>
+            </item>
+            <item>
+                <key> <string>state</string> </key>
+                <value> <string>current</string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass> <reference id="3.1"/> </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1332768182.32</float>
+                        <string>GMT+2</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value>
+                  <none/>
+                </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>superluke</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>error_message</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global id="4.1" name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1332768172.28</float>
+                        <string>GMT+2</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>draft</string> </value>
+            </item>
+          </dictionary>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate_action</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>superluke</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>error_message</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass> <reference id="4.1"/> </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1332775729.22</float>
+                        <string>GMT+2</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>draft</string> </value>
+            </item>
+          </dictionary>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>superluke</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>error_message</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass> <reference id="4.1"/> </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1332775729.22</float>
+                        <string>GMT+2</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <global name="Message" module="Products.ERP5Type.Message"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default</string> </key>
+            <value> <string>Object copied from ${source_item}</string> </value>
+        </item>
+        <item>
+            <key> <string>domain</string> </key>
+            <value> <string>erp5_ui</string> </value>
+        </item>
+        <item>
+            <key> <string>mapping</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>source_item</string> </key>
+                    <value> <string>/erp5/service_module/vifib_software_setup</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>message</string> </key>
+            <value> <string>Object copied from ${source_item}</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/master/bt5/vifib_data/PreferenceTemplateItem/portal_preferences/vifib_default_system_preference.xml b/master/bt5/vifib_data/PreferenceTemplateItem/portal_preferences/vifib_default_system_preference.xml
index 3191d474cc2da0af2047e9d43eb476d99e93f14f..e586a7d58c3fe979c69df05569f1e3743f6542eb 100644
--- a/master/bt5/vifib_data/PreferenceTemplateItem/portal_preferences/vifib_default_system_preference.xml
+++ b/master/bt5/vifib_data/PreferenceTemplateItem/portal_preferences/vifib_default_system_preference.xml
@@ -141,6 +141,10 @@
             <key> <string>preferred_registration_resource</string> </key>
             <value> <string>service_module/vifib_registration</string> </value>
         </item>
+        <item>
+            <key> <string>preferred_software_cleanup_resource</string> </key>
+            <value> <string>service_module/vifib_software_cleanup</string> </value>
+        </item>
         <item>
             <key> <string>preferred_software_setup_resource</string> </key>
             <value> <string>service_module/vifib_software_setup</string> </value>
diff --git a/master/bt5/vifib_data/bt/revision b/master/bt5/vifib_data/bt/revision
index d97edbb29fa140807215ea46cfdc2b84f4c97dcd..105d7d9ad3afc7bb78a0dec4d829880831605dfb 100644
--- a/master/bt5/vifib_data/bt/revision
+++ b/master/bt5/vifib_data/bt/revision
@@ -1 +1 @@
-99
\ No newline at end of file
+100
\ No newline at end of file
diff --git a/master/bt5/vifib_data/bt/template_keep_workflow_path_list b/master/bt5/vifib_data/bt/template_keep_workflow_path_list
index 0ed1dfbf588ed7b6d3745ceb70a2dfe8afa86c07..d29df5f40ce7d2a230129178a049c6444c16c8b0 100644
--- a/master/bt5/vifib_data/bt/template_keep_workflow_path_list
+++ b/master/bt5/vifib_data/bt/template_keep_workflow_path_list
@@ -6,4 +6,5 @@ service_module/vifib_instance_setup
 service_module/vifib_instance_subscription
 service_module/vifib_instance_update
 service_module/vifib_software_setup
+service_module/vifib_software_cleanup
 service_module/vifib_usage_report
\ No newline at end of file
diff --git a/master/bt5/vifib_data/bt/template_local_role_list b/master/bt5/vifib_data/bt/template_local_role_list
index 3f204def9ce82414b5e6baf197530dc124817900..253a8d785cdf356e96deef6ae33b3880dfcaf816 100644
--- a/master/bt5/vifib_data/bt/template_local_role_list
+++ b/master/bt5/vifib_data/bt/template_local_role_list
@@ -6,5 +6,6 @@ service_module/vifib_instance_hosting
 service_module/vifib_instance_setup
 service_module/vifib_instance_subscription
 service_module/vifib_instance_update
+service_module/vifib_software_cleanup
 service_module/vifib_software_setup
 service_module/vifib_usage_report
\ No newline at end of file
diff --git a/master/bt5/vifib_data/bt/template_local_roles_list b/master/bt5/vifib_data/bt/template_local_roles_list
index f1a26d7f31abf57b6d1c67f738904f549f90a93c..28a6345710258fc92f9d5f8c21d9c862792c12a8 100644
--- a/master/bt5/vifib_data/bt/template_local_roles_list
+++ b/master/bt5/vifib_data/bt/template_local_roles_list
@@ -2,9 +2,10 @@ currency_module/EUR
 service_module/cpu_consumption
 service_module/memory_consumption
 service_module/vifib_instance_cleanup
-service_module/vifib_instance_subscription
 service_module/vifib_instance_hosting
 service_module/vifib_instance_setup
+service_module/vifib_instance_subscription
 service_module/vifib_instance_update
 service_module/vifib_software_setup
+service_module/vifib_software_cleanup
 service_module/vifib_usage_report
\ No newline at end of file
diff --git a/master/bt5/vifib_data/bt/template_path_list b/master/bt5/vifib_data/bt/template_path_list
index d85600919ff5d433ae1b75525a5065aa32f29886..72fa233cf0d4c5246ae0bd486f4deb890303ec94 100644
--- a/master/bt5/vifib_data/bt/template_path_list
+++ b/master/bt5/vifib_data/bt/template_path_list
@@ -13,5 +13,6 @@ service_module/vifib_instance_subscription
 service_module/vifib_instance_subscription/default_ssl
 service_module/vifib_instance_update
 service_module/vifib_instance_update/default_ssl
+service_module/vifib_software_cleanup
 service_module/vifib_software_setup
 service_module/vifib_usage_report
\ No newline at end of file