diff --git a/goKMS/kms/event/event.go b/goKMS/kms/event/event.go
index c0a32e8418e44bf11431e72606aad8649af6e130..2e89cf2b52842a72dbfff0529a32555c69c248ec 100644
--- a/goKMS/kms/event/event.go
+++ b/goKMS/kms/event/event.go
@@ -93,9 +93,9 @@ type KeyStoreEvent struct {
 	Timestamp  time.Time
 }
 
-func NewKeyStoreEvent() *RouteEvent {
-	return &RouteEvent{
-		EventTopic: ROUTE,
+func NewKeyStoreEvent() *KeyStoreEvent {
+	return &KeyStoreEvent{
+		EventTopic: KEY_STORE,
 		Timestamp:  time.Now(),
 	}
 }
diff --git a/goKMS/kms/store/kms-keystore.go b/goKMS/kms/store/kms-keystore.go
index 73a06671498ab6e2a8900d1bf1b2c0117f554972..683c5634c5acdfdd164269dbb0db73d5208fca81 100644
--- a/goKMS/kms/store/kms-keystore.go
+++ b/goKMS/kms/store/kms-keystore.go
@@ -4,7 +4,6 @@ import (
 	"encoding/base64"
 	"fmt"
 	"sync"
-	"time"
 
 	etsi14 "code.fbi.h-da.de/danet/quant/etsi014/go/rest/etsi/client"
 	"code.fbi.h-da.de/danet/quant/goKMS/kms/event"
@@ -70,7 +69,7 @@ func (ks *KmsKeyStore) AddKey(keyId uuid.UUID, keyToadd []byte) error {
 
 	// publish to eventBus
 	go func() {
-		err := ks.eventBus.Publish(&event.KeyStoreEvent{EventTopic: event.KEY_STORE, Timestamp: time.Now()})
+		err := ks.eventBus.Publish(event.NewKeyStoreEvent())
 		if err != nil {
 			fmt.Errorf("Publishing a key store update through the eventBus failed, err: %w", err)
 		}
@@ -115,7 +114,7 @@ func (ks *KmsKeyStore) DeleteKey(keyId uuid.UUID) {
 
 	// publish to eventBus
 	go func() {
-		err := ks.eventBus.Publish(&event.KeyStoreEvent{EventTopic: event.KEY_STORE, Timestamp: time.Now()})
+		err := ks.eventBus.Publish(event.NewKeyStoreEvent())
 		if err != nil {
 			fmt.Errorf("Publishing a key store update through the eventBus failed, err: %w", err)
 		}