diff --git a/src/main/java/eu/m724/mstats/api/resource/AdminApiResource.java b/src/main/java/eu/m724/mstats/api/resource/AdminApiResource.java
index a89f627..392b1f4 100644
--- a/src/main/java/eu/m724/mstats/api/resource/AdminApiResource.java
+++ b/src/main/java/eu/m724/mstats/api/resource/AdminApiResource.java
@@ -4,6 +4,7 @@ package eu.m724.mstats.api.resource;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import eu.m724.mstats.api.service.AdminService;
 import eu.m724.mstats.orm.Plugin;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityExistsException;
@@ -14,6 +15,7 @@ import jakarta.ws.rs.core.Response;
 import java.util.ArrayList;
 import java.util.List;
 
+@RegisterForReflection
 @Path("/api/admin")
 @RolesAllowed("admin")
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/src/main/java/eu/m724/mstats/api/resource/InfoApiResource.java b/src/main/java/eu/m724/mstats/api/resource/InfoApiResource.java
index 51df976..c887f8a 100644
--- a/src/main/java/eu/m724/mstats/api/resource/InfoApiResource.java
+++ b/src/main/java/eu/m724/mstats/api/resource/InfoApiResource.java
@@ -3,6 +3,7 @@ package eu.m724.mstats.api.resource;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import eu.m724.mstats.orm.Plugin;
 import eu.m724.mstats.orm.Server;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
@@ -10,6 +11,7 @@ import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
+@RegisterForReflection
 @Path("/api/info")
 @Produces(MediaType.APPLICATION_JSON)
 public class InfoApiResource {
diff --git a/src/main/java/eu/m724/mstats/api/resource/PluginApiResource.java b/src/main/java/eu/m724/mstats/api/resource/PluginApiResource.java
index 373e81a..04ee7b7 100644
--- a/src/main/java/eu/m724/mstats/api/resource/PluginApiResource.java
+++ b/src/main/java/eu/m724/mstats/api/resource/PluginApiResource.java
@@ -6,6 +6,7 @@ import eu.m724.mstats.api.service.PluginService;
 import eu.m724.mstats.orm.Plugin;
 import eu.m724.mstats.orm.PluginVersion;
 import eu.m724.mstats.orm.Server;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.GET;
@@ -18,6 +19,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@RegisterForReflection
 @Path("/api/plugin")
 @Produces(MediaType.APPLICATION_JSON)
 public class PluginApiResource {
diff --git a/src/main/java/eu/m724/mstats/api/resource/ServerApiResource.java b/src/main/java/eu/m724/mstats/api/resource/ServerApiResource.java
index 758933e..65e40cb 100644
--- a/src/main/java/eu/m724/mstats/api/resource/ServerApiResource.java
+++ b/src/main/java/eu/m724/mstats/api/resource/ServerApiResource.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import eu.m724.mstats.orm.Server;
 import eu.m724.mstats.api.service.ServerService;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
@@ -18,6 +19,7 @@ import jakarta.ws.rs.core.Response;
 import java.util.ArrayList;
 import java.util.List;
 
+@RegisterForReflection
 @Path("/api/server")
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
@@ -79,7 +81,6 @@ public class ServerApiResource {
         public HeartbeatRequest() {}
     }
 
-    @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class HeartbeatResponse {
         /** New token assigned to the server, usually after first request */
         @JsonProperty("token")