diff --git a/friendships-service/src/main/kotlin/piperkt/services/friendships/infrastructure/events/SerializableFriendshipEvents.kt b/friendships-service/src/main/kotlin/piperkt/services/friendships/infrastructure/events/SerializableFriendshipEvents.kt
index d2228ab14..95f2e6f7c 100644
--- a/friendships-service/src/main/kotlin/piperkt/services/friendships/infrastructure/events/SerializableFriendshipEvents.kt
+++ b/friendships-service/src/main/kotlin/piperkt/services/friendships/infrastructure/events/SerializableFriendshipEvents.kt
@@ -1,6 +1,13 @@
 package piperkt.services.friendships.infrastructure.events
 
 import io.micronaut.serde.annotation.SerdeImport
-import piperkt.events.FriendshipEvent
+import piperkt.events.FriendshipRequestAcceptedEvent
+import piperkt.events.FriendshipRequestRejectedEvent
+import piperkt.events.FriendshipRequestSentEvent
+import piperkt.events.NewMessageInFriendshipEvent
 
-@SerdeImport(FriendshipEvent::class) object SerializableFriendshipEvents
+@SerdeImport(FriendshipRequestSentEvent::class)
+@SerdeImport(FriendshipRequestAcceptedEvent::class)
+@SerdeImport(FriendshipRequestRejectedEvent::class)
+@SerdeImport(NewMessageInFriendshipEvent::class)
+object SerializableFriendshipEvents
diff --git a/servers-service/src/main/kotlin/piperkt/services/servers/infrastructure/events/SerializableEvents.kt b/servers-service/src/main/kotlin/piperkt/services/servers/infrastructure/events/SerializableEvents.kt
index ad1f26896..194f9b52e 100644
--- a/servers-service/src/main/kotlin/piperkt/services/servers/infrastructure/events/SerializableEvents.kt
+++ b/servers-service/src/main/kotlin/piperkt/services/servers/infrastructure/events/SerializableEvents.kt
@@ -1,9 +1,27 @@
 package piperkt.services.servers.infrastructure.events
 
 import io.micronaut.serde.annotation.SerdeImport
-import piperkt.events.ChannelEvent
-import piperkt.events.ServerEvent
+import piperkt.events.ChannelCreatedEvent
+import piperkt.events.ChannelDeletedEvent
+import piperkt.events.ChannelUpdatedEvent
+import piperkt.events.MessageInChannelEvent
+import piperkt.events.ServerCreatedEvent
+import piperkt.events.ServerDeletedEvent
+import piperkt.events.ServerUpdatedEvent
+import piperkt.events.ServerUserAddedEvent
+import piperkt.events.ServerUserKickedEvent
+import piperkt.events.ServerUserRemovedEvent
 
-@SerdeImport(ServerEvent::class) object SerializableServerEvents
+@SerdeImport(ServerCreatedEvent::class)
+@SerdeImport(ServerUpdatedEvent::class)
+@SerdeImport(ServerUserAddedEvent::class)
+@SerdeImport(ServerUserRemovedEvent::class)
+@SerdeImport(ServerUserKickedEvent::class)
+@SerdeImport(ServerDeletedEvent::class)
+object SerializableServerEvents
 
-@SerdeImport(ChannelEvent::class) object SerializableChannelEvents
+@SerdeImport(ChannelCreatedEvent::class)
+@SerdeImport(ChannelDeletedEvent::class)
+@SerdeImport(ChannelUpdatedEvent::class)
+@SerdeImport(MessageInChannelEvent::class)
+object SerializableChannelEvents