diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/provision/CertificateRequestProcessor.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/provision/CertificateRequestProcessor.java
index 15d37795..23c39cb1 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/provision/CertificateRequestProcessor.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/provision/CertificateRequestProcessor.java
@@ -191,7 +191,7 @@ public class CertificateRequestProcessor extends AbstractProcessor {
                             attestationCertificate);
                     String pemEncodedAttestationCertificate = ProvisionUtils.getPemEncodedCertificate(
                             attestationCertificate);
- 
+
                     // We validated the nonce and made use of the identity claim so state can be deleted
                     tpm2ProvisionerStateRepository.delete(tpm2ProvisionerState);
 
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/HIRSApplication.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/HIRSApplication.java
index 06833945..29cc4b85 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/HIRSApplication.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/HIRSApplication.java
@@ -4,6 +4,7 @@ import lombok.extern.log4j.Log4j2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+@SuppressWarnings("checkstyle:hideutilityclassconstructor")
 @SpringBootApplication
 //@EnableAutoConfiguration
 @Log4j2
@@ -24,7 +25,9 @@ public class HIRSApplication {
 //    }
 
     /**
-     * @param args
+     * This is the starting point of the HIRS application.
+     *
+     * @param args main method arguments
      */
     public static void main(final String[] args) {
 //        SpringApplication springApplication = new SpringApplication(HIRSApplication.class);
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java
index ae02253e..36ce7d06 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java
@@ -224,7 +224,9 @@ public class PersistenceJPAConfig implements WebMvcConfigurer {
     }
 
     /**
-     * @return
+     * Platform Transaction Manager bean.
+     *
+     * @return platform transaction manager bean
      */
     @Bean
     public PlatformTransactionManager transactionManager() {
@@ -234,7 +236,9 @@ public class PersistenceJPAConfig implements WebMvcConfigurer {
     }
 
     /**
-     * @return
+     * Persistence Exception Translation Post Processor bean.
+     *
+     * @return persistence exception translation post processor bean
      */
     @Bean
     public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/datatables/OrderedListQueryDataTableAdapter.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/datatables/OrderedListQueryDataTableAdapter.java
index 661397f1..160fb169 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/datatables/OrderedListQueryDataTableAdapter.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/datatables/OrderedListQueryDataTableAdapter.java
@@ -5,8 +5,6 @@ import hirs.attestationca.persist.FilteredRecordsList;
 import hirs.attestationca.persist.entity.userdefined.rim.ReferenceDigestValue;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.CriteriaQuery;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.util.CollectionUtils;
@@ -23,10 +21,15 @@ import java.util.UUID;
  *
  * @param <T> The type of object to query
  */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
 @Log4j2
 public final class OrderedListQueryDataTableAdapter<T> {
 
+    /**
+     * Private constructor was created to silence checkstyle error.
+     */
+    private OrderedListQueryDataTableAdapter() {
+    }
+
     /**
      * Gets the ordered list of records using a default, no-op criteria modifier.
      *
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/utils/CertificateStringMapBuilder.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/utils/CertificateStringMapBuilder.java
index 09ea707c..4b48537e 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/utils/CertificateStringMapBuilder.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/utils/CertificateStringMapBuilder.java
@@ -15,8 +15,6 @@ import hirs.attestationca.persist.entity.userdefined.certificate.attributes.Plat
 import hirs.attestationca.persist.util.AcaPciIds;
 import hirs.utils.BouncyCastleUtils;
 import hirs.utils.PciIds;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.bouncycastle.util.encoders.Hex;
 
@@ -36,8 +34,12 @@ import java.util.UUID;
  * information on a web page, as X509 cert classes do not serialize to JSON
  */
 @Log4j2
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class CertificateStringMapBuilder {
+    /**
+     * This private constructor was created to silence checkstyle error.
+     */
+    private CertificateStringMapBuilder() {
+    }
 
     /**
      * Returns the general information.
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
index f0a4b442..31e31c3e 100644
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -6,11 +6,15 @@
 
 <suppressions>
     <!-- Ignore Auto generated files -->
-    <suppress files="[/\\]hirs[/\\]utils[/\\]xjc[/\\]" checks=".*" />
-    <suppress files="ProvisionerTpm2.java" checks=".*" />
+    <suppress files="[/\\]hirs[/\\]utils[/\\]xjc[/\\]" checks=".*"/>
+    <suppress files="ProvisionerTpm2.java" checks=".*"/>
 
     <!-- HIRS_Utils -->
     <!-- This ignores checking all public variable for a javadoc -->
-    <suppress files="SwidTagConstants.java" checks="LineLength" />
-    <suppress files="SwidTagConstants.java" checks="JavadocVariable" />
+    <suppress files="SwidTagConstants.java" checks="LineLength"/>
+    <suppress files="SwidTagConstants.java" checks="JavadocVariable"/>
+
+    <!-- This ignores checking for public constructors in utility classes in certain files -->
+    <suppress files="HIRSApplication.java" checks="HideUtilityClassConstructor"/>
+    <suppress files="PersistenceConfiguration.java" checks="HideUtilityClassConstructor"/>
 </suppressions>
\ No newline at end of file