diff --git a/java/code/src/com/redhat/rhn/domain/audit/XccdfBenchmark.java b/java/code/src/com/redhat/rhn/domain/audit/XccdfBenchmark.java
index 274c763ced82..a2ce7ad48b9a 100644
--- a/java/code/src/com/redhat/rhn/domain/audit/XccdfBenchmark.java
+++ b/java/code/src/com/redhat/rhn/domain/audit/XccdfBenchmark.java
@@ -14,10 +14,12 @@
  */
 package com.redhat.rhn.domain.audit;
 
+import java.io.Serializable;
+
 /**
  * XccdfBenchmark - Class representation of the table rhnXccdfBenchmark.
  */
-public class XccdfBenchmark {
+public class XccdfBenchmark implements Serializable {
 
     private Long id;
     private String identifier;
diff --git a/java/code/src/com/redhat/rhn/domain/audit/XccdfProfile.java b/java/code/src/com/redhat/rhn/domain/audit/XccdfProfile.java
index 72d6c9febcca..bf8dad765cd2 100644
--- a/java/code/src/com/redhat/rhn/domain/audit/XccdfProfile.java
+++ b/java/code/src/com/redhat/rhn/domain/audit/XccdfProfile.java
@@ -14,10 +14,12 @@
  */
 package com.redhat.rhn.domain.audit;
 
+import java.io.Serializable;
+
 /**
  * XccdfProfile - Class representation of the table rhnXccdfProfile.
  */
-public class XccdfProfile {
+public class XccdfProfile implements Serializable {
 
     private Long id;
     private String identifier;
diff --git a/java/code/src/com/redhat/rhn/domain/audit/XccdfRuleResult.java b/java/code/src/com/redhat/rhn/domain/audit/XccdfRuleResult.java
index 0576f908389f..649ebc2ae436 100644
--- a/java/code/src/com/redhat/rhn/domain/audit/XccdfRuleResult.java
+++ b/java/code/src/com/redhat/rhn/domain/audit/XccdfRuleResult.java
@@ -14,13 +14,14 @@
  */
 package com.redhat.rhn.domain.audit;
 
+import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
 /**
  * XccdfRuleResult - Class representation of the table rhnXccdfRuleresult.
  */
-public class XccdfRuleResult {
+public class XccdfRuleResult implements Serializable {
 
     private Long id;
 
diff --git a/java/code/src/com/redhat/rhn/domain/server/MgrServerInfo.java b/java/code/src/com/redhat/rhn/domain/server/MgrServerInfo.java
index b50af53ad65c..3690948e62f0 100644
--- a/java/code/src/com/redhat/rhn/domain/server/MgrServerInfo.java
+++ b/java/code/src/com/redhat/rhn/domain/server/MgrServerInfo.java
@@ -20,12 +20,13 @@
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * MgrServerInfo
  */
-public class MgrServerInfo {
+public class MgrServerInfo implements Serializable {
 
     private Server server;
     private PackageEvr version;
diff --git a/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java b/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java
index dab54c74a29b..eb63a5a8933c 100644
--- a/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java
+++ b/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java
@@ -21,11 +21,13 @@
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
+import java.io.Serializable;
+
 
 /**
  * @author paji
  */
-public class ProxyInfo {
+public class ProxyInfo implements Serializable {
     private Server server;
     private PackageEvr version;
     private Long id;
diff --git a/java/code/src/com/redhat/rhn/domain/server/PushClient.java b/java/code/src/com/redhat/rhn/domain/server/PushClient.java
index 01f78e78c30b..69fbe635ea3d 100644
--- a/java/code/src/com/redhat/rhn/domain/server/PushClient.java
+++ b/java/code/src/com/redhat/rhn/domain/server/PushClient.java
@@ -14,12 +14,13 @@
  */
 package com.redhat.rhn.domain.server;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * PushClient - Class representation of the table rhnpushclient.
  */
-public class PushClient {
+public class PushClient implements Serializable {
 
     private Long id;
     private String name;
diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerAppStream.java b/java/code/src/com/redhat/rhn/domain/server/ServerAppStream.java
index 66e187d7ddd6..4f72b5ca90e2 100644
--- a/java/code/src/com/redhat/rhn/domain/server/ServerAppStream.java
+++ b/java/code/src/com/redhat/rhn/domain/server/ServerAppStream.java
@@ -14,6 +14,7 @@
  */
 package com.redhat.rhn.domain.server;
 
+import java.io.Serializable;
 import java.util.Map;
 
 import javax.persistence.Column;
@@ -28,7 +29,7 @@
 
 @Entity
 @Table(name = "suseServerAppstream")
-public class ServerAppStream {
+public class ServerAppStream implements Serializable  {
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "appstreams_servermodule_seq")
     @SequenceGenerator(name = "appstreams_servermodule_seq", sequenceName = "suse_as_servermodule_seq",
diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerInfo.java b/java/code/src/com/redhat/rhn/domain/server/ServerInfo.java
index e0e5e8d1a389..f01d94196f78 100644
--- a/java/code/src/com/redhat/rhn/domain/server/ServerInfo.java
+++ b/java/code/src/com/redhat/rhn/domain/server/ServerInfo.java
@@ -14,12 +14,13 @@
  */
 package com.redhat.rhn.domain.server;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * ServerInfo - Class representation of the table rhnServerInfo
  */
-public class ServerInfo {
+public class ServerInfo implements Serializable {
 
     private Long id;
     private Server server;
diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerLock.java b/java/code/src/com/redhat/rhn/domain/server/ServerLock.java
index 09de3a30c1c5..95fe095f985b 100644
--- a/java/code/src/com/redhat/rhn/domain/server/ServerLock.java
+++ b/java/code/src/com/redhat/rhn/domain/server/ServerLock.java
@@ -16,12 +16,13 @@
 
 import com.redhat.rhn.domain.user.User;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * ServerLock - Class representation of the table rhnServerLock.
  */
-public class ServerLock {
+public class ServerLock implements Serializable {
 
     private Long id;
     private Server server;
diff --git a/java/code/src/com/redhat/rhn/domain/state/StateRevision.java b/java/code/src/com/redhat/rhn/domain/state/StateRevision.java
index ec5938a29d4a..0da8f15cbace 100644
--- a/java/code/src/com/redhat/rhn/domain/state/StateRevision.java
+++ b/java/code/src/com/redhat/rhn/domain/state/StateRevision.java
@@ -59,7 +59,7 @@ public class StateRevision {
     private Long id;
 
     @OneToMany(mappedBy = "stateRevision", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    private Set<PackageState> packageStates = new HashSet<>();;
+    private Set<PackageState> packageStates = new HashSet<>();
 
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinTable(
diff --git a/java/code/src/com/redhat/rhn/domain/token/TokenChannelAppStream.java b/java/code/src/com/redhat/rhn/domain/token/TokenChannelAppStream.java
index a65c046cf86d..bf65d305efb1 100644
--- a/java/code/src/com/redhat/rhn/domain/token/TokenChannelAppStream.java
+++ b/java/code/src/com/redhat/rhn/domain/token/TokenChannelAppStream.java
@@ -16,6 +16,8 @@
 
 import com.redhat.rhn.domain.channel.Channel;
 
+import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -28,7 +30,7 @@
 
 @Entity
 @Table(name = "suseRegTokenChannelAppStream")
-public class TokenChannelAppStream {
+public class TokenChannelAppStream implements Serializable {
 
     /**
      * Constructs a TokenChannelAppStream instance.
diff --git a/java/code/src/com/redhat/rhn/taskomatic/domain/TaskoRun.java b/java/code/src/com/redhat/rhn/taskomatic/domain/TaskoRun.java
index 897144de1eab..92bddfe6f167 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/domain/TaskoRun.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/domain/TaskoRun.java
@@ -16,13 +16,14 @@
 
 import com.redhat.rhn.taskomatic.TaskoFactory;
 
+import java.io.Serializable;
 import java.util.Date;
 
 
 /**
  * TaskoRun
  */
-public class TaskoRun {
+public class TaskoRun implements Serializable {
 
     public static final String STATUS_READY_TO_RUN = "READY";
     public static final String STATUS_RUNNING = "RUNNING";
diff --git a/java/code/src/com/suse/manager/model/attestation/ServerCoCoAttestationConfig.java b/java/code/src/com/suse/manager/model/attestation/ServerCoCoAttestationConfig.java
index 9e0f1942f0a7..c9ce25399aa1 100644
--- a/java/code/src/com/suse/manager/model/attestation/ServerCoCoAttestationConfig.java
+++ b/java/code/src/com/suse/manager/model/attestation/ServerCoCoAttestationConfig.java
@@ -19,6 +19,8 @@
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
+import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
@@ -32,7 +34,7 @@
 
 @Entity
 @Table(name = "suseServerCoCoAttestationConfig")
-public class ServerCoCoAttestationConfig {
+public class ServerCoCoAttestationConfig implements Serializable  {
     private Long id;
     private Server server;
     private boolean enabled;