diff --git a/src/main/java/org/fairdatapoint/service/openapi/OpenApiService.java b/src/main/java/org/fairdatapoint/service/openapi/OpenApiService.java
index 49b1892be..2b4e84e42 100644
--- a/src/main/java/org/fairdatapoint/service/openapi/OpenApiService.java
+++ b/src/main/java/org/fairdatapoint/service/openapi/OpenApiService.java
@@ -25,11 +25,12 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.Paths;
-import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
 import org.fairdatapoint.entity.resource.ResourceDefinition;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -111,7 +112,7 @@ public void updateAllGenericPaths() {
         updateTags(resourceDefinitions);
     }
 
-    @PostConstruct
+    @EventListener(ApplicationReadyEvent.class)
     public void init() {
         log.info("Initializing OpenAPI with generic paths");
         updateAllGenericPaths();