diff --git a/CHANGES.rst b/CHANGES.rst
index 8ab7475..375decf 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,7 @@ Changelog
 4.0.0 (unreleased)
 ------------------
 
-- Modernize the code to use plone.base
+- Modernize the code to use plone.base and remove deprecation warnings
   [ale-rt]
 - Support only Python 3.9+ and Plone 6.0+.
   Removed support for Plone 5.1 and Plone 5.2.
diff --git a/src/collective/workspace/membership.py b/src/collective/workspace/membership.py
index cd70467..cd4f9ea 100644
--- a/src/collective/workspace/membership.py
+++ b/src/collective/workspace/membership.py
@@ -9,7 +9,7 @@
 from copy import deepcopy
 from DateTime import DateTime
 from plone import api
-from plone.app.z3cform.widget import AjaxSelectFieldWidget
+from plone.app.z3cform.widgets.select import AjaxSelectFieldWidget
 from plone.autoform import directives as form
 from plone.supermodel import model
 from plone.uuid.interfaces import IUUIDGenerator
diff --git a/src/collective/workspace/workspace.py b/src/collective/workspace/workspace.py
index a3496e4..674e4dc 100644
--- a/src/collective/workspace/workspace.py
+++ b/src/collective/workspace/workspace.py
@@ -15,11 +15,11 @@
 from Products.PluggableAuthService.interfaces.events import IPrincipalDeletedEvent
 from zope.component import adapter
 from zope.component import getUtility
-from zope.container.interfaces import IObjectAddedEvent
-from zope.container.interfaces import IObjectRemovedEvent
 from zope.event import notify
+from zope.lifecycleevent.interfaces import IObjectAddedEvent
 from zope.lifecycleevent.interfaces import IObjectCopiedEvent
 from zope.lifecycleevent.interfaces import IObjectModifiedEvent
+from zope.lifecycleevent.interfaces import IObjectRemovedEvent
 
 
 class Workspace(object):