diff --git a/CHANGES.rst b/CHANGES.rst
index 7f2e3d3..13289f9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,7 @@ Changelog
 2.1.0 (unreleased)
 ------------------
 
+- #28 Added upgrade step event subscriber
 - #27 Integrate dispatch workflow from senaite.core
 - #26 Disallow to modify portal content when stored/booked out samples
 - #25 Remove booked out samples from container
diff --git a/src/senaite/storage/subscribers/configure.zcml b/src/senaite/storage/subscribers/configure.zcml
index e0b2d4a..cd5b293 100644
--- a/src/senaite/storage/subscribers/configure.zcml
+++ b/src/senaite/storage/subscribers/configure.zcml
@@ -2,6 +2,12 @@
     xmlns="http://namespaces.zope.org/zope"
     i18n_domain="senaite.storage">
 
+  <!-- After upgrade step event handler -->
+  <subscriber
+    for="senaite.core.events.upgrade.IAfterUpgradeStepEvent"
+    handler="senaite.storage.subscribers.upgrade.afterUpgradeStepHandler"
+  />
+
   <!-- Modified a container. Updates capacity and usage to parent -->
   <subscriber
     for="senaite.storage.interfaces.IStorageLayoutContainer
diff --git a/src/senaite/storage/subscribers/upgrade.py b/src/senaite/storage/subscribers/upgrade.py
new file mode 100644
index 0000000..5d434af
--- /dev/null
+++ b/src/senaite/storage/subscribers/upgrade.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+from senaite.storage.setuphandlers import post_install
+
+
+def afterUpgradeStepHandler(event):
+    """Event handler that is executed after running an upgrade step of senaite.core
+    """
+    setup = event.context
+    post_install(setup)