diff --git a/cassandra-embedded/src/main/java/org/openidentityplatform/commons/cassandra/EmbeddedServer.java b/cassandra-embedded/src/main/java/org/openidentityplatform/commons/cassandra/EmbeddedServer.java
index 69ee78275a..e5bc1a9d34 100644
--- a/cassandra-embedded/src/main/java/org/openidentityplatform/commons/cassandra/EmbeddedServer.java
+++ b/cassandra-embedded/src/main/java/org/openidentityplatform/commons/cassandra/EmbeddedServer.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2019 Open Identity Platform Community.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.openidentityplatform.commons.cassandra;
@@ -64,9 +65,9 @@ public void run() {
 	        	Files.createDirectory(Paths.get("target"));
 	        }
 	        if (!Files.exists(Paths.get("target"+File.separator+"embedded_keystore"))) {
-	        	Files.copy(this.getClass().getResourceAsStream("/embedded_keystore"),Paths.get("target"+File.separator+"embedded_keystore"),StandardCopyOption.REPLACE_EXISTING);
+	        	Files.copy(EmbeddedServer.class.getResourceAsStream("/embedded_keystore"),Paths.get("target"+File.separator+"embedded_keystore"),StandardCopyOption.REPLACE_EXISTING);
 	        }
-	        Files.copy(this.getClass().getResourceAsStream("/cassandra.yaml"),Paths.get("target"+File.separator+"cassandra.yaml"),StandardCopyOption.REPLACE_EXISTING);
+	        Files.copy(EmbeddedServer.class.getResourceAsStream("/cassandra.yaml"),Paths.get("target"+File.separator+"cassandra.yaml"),StandardCopyOption.REPLACE_EXISTING);
 	        System.setProperty("cassandra.config",""+Paths.get("target"+File.separator+"cassandra.yaml").toUri());
 	        //start
 //	        final CountDownLatch startupLatch = new CountDownLatch(1) ;
@@ -96,7 +97,7 @@ public void run() {
 	        }
 	        //load
 	        String dataSetLocation=System.getProperty(EmbeddedServer.class.getPackage().getName()+".import","cassandra/import.cql");
-	        InputStream inputStream=this.getClass().getResourceAsStream("/" + dataSetLocation);
+	        InputStream inputStream=EmbeddedServer.class.getResourceAsStream("/" + dataSetLocation);
 	        if (inputStream!=null) {
 	        	 try (CqlSession session = CqlSession.builder().withApplicationName("load cassandra/import.cql").build()){
 	 	        	for (String statement : Arrays.asList(StringUtils.normalizeSpace(inputStreamToString(inputStream)).split(";"))) {
@@ -115,7 +116,7 @@ public void run() {
 	        //load test
 	        dataSetLocation=System.getProperty(EmbeddedServer.class.getPackage().getName()+".import.test");
 	        if (dataSetLocation!=null) {
-		        inputStream=this.getClass().getResourceAsStream("/" + dataSetLocation);
+		        inputStream=EmbeddedServer.class.getResourceAsStream("/" + dataSetLocation);
 		        if (inputStream==null) {
 		        	throw new AssertionError("cannot get resource "+dataSetLocation);
 		        }
diff --git a/commons/audit/core/src/main/java/org/forgerock/audit/events/EventTopicsMetaDataBuilder.java b/commons/audit/core/src/main/java/org/forgerock/audit/events/EventTopicsMetaDataBuilder.java
index 2847f3c31b..3a70fa86dd 100644
--- a/commons/audit/core/src/main/java/org/forgerock/audit/events/EventTopicsMetaDataBuilder.java
+++ b/commons/audit/core/src/main/java/org/forgerock/audit/events/EventTopicsMetaDataBuilder.java
@@ -158,7 +158,7 @@ private Map<String, JsonValue> readCoreEventTopicSchemas() {
     }
 
     private InputStream getResourceAsStream(String resourcePath) {
-        return new BufferedInputStream(getClass().getResourceAsStream(resourcePath));
+        return new BufferedInputStream(EventTopicsMetaDataBuilder.class.getResourceAsStream(resourcePath));
     }
 
     private void extendCoreEventTopicsSchemas(Map<String, JsonValue> auditEventTopicSchemas) {
diff --git a/commons/audit/servlet/src/main/java/org/forgerock/audit/AuditHttpApplication.java b/commons/audit/servlet/src/main/java/org/forgerock/audit/AuditHttpApplication.java
index 78853e81b4..66cd4264d7 100644
--- a/commons/audit/servlet/src/main/java/org/forgerock/audit/AuditHttpApplication.java
+++ b/commons/audit/servlet/src/main/java/org/forgerock/audit/AuditHttpApplication.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.audit;
@@ -60,7 +61,7 @@ public Handler start() throws HttpApplicationException {
         AuditServiceBuilder auditServiceBuilder = newAuditService();
         auditServiceBuilder.withConfiguration(auditServiceConfiguration);
 
-        try (final InputStream eventHandlersConfig = this.getClass().getResourceAsStream(AUDIT_EVENT_HANDLERS_CONFIG)) {
+        try (final InputStream eventHandlersConfig = AuditHttpApplication.class.getResourceAsStream(AUDIT_EVENT_HANDLERS_CONFIG)) {
             JsonValue auditEventHandlers = getJson(eventHandlersConfig).get(EVENT_HANDLERS);
             for (final JsonValue handlerConfig : auditEventHandlers) {
                 try {
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/AbstractDocbkxMojo.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/AbstractDocbkxMojo.java
index b23416f036..4674f4bdfe 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/AbstractDocbkxMojo.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/AbstractDocbkxMojo.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.doc.maven;
@@ -64,7 +65,7 @@ private void loadVersions() {
         InputStream inputStream = null;
 
         try {
-            inputStream = getClass().getResourceAsStream("/versions.properties");
+            inputStream = AbstractDocbkxMojo.class.getResourceAsStream("/versions.properties");
             if (inputStream == null) {
                 throw new IOException("Could not read properties resource");
             }
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/Bootstrap.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/Bootstrap.java
index 095d3ca3c4..340127036a 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/Bootstrap.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/Bootstrap.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.doc.maven.post;
@@ -114,7 +115,7 @@ final void editBuiltHtml(final String htmlDir) throws
 
             if(m.getGoogleAnalyticsId() != null) {
                 String gascript = IOUtils.toString(
-                        getClass().getResourceAsStream("/endhead-ga.txt"), "UTF-8");
+                        Bootstrap.class.getResourceAsStream("/endhead-ga.txt"), "UTF-8");
                 gascript = gascript.replace("ANALYTICS-ID", m.getGoogleAnalyticsId());
                 replacements.put("</head>", gascript);
             }
@@ -133,7 +134,7 @@ final void addDraftAlert(final String htmlDir) throws
         try {
             HashMap<String, String> replacements = new HashMap<String, String>();
             String draftAlert = IOUtils.toString(
-                    getClass().getResourceAsStream("/endbody-draftalert.txt"), "UTF-8");
+                    Bootstrap.class.getResourceAsStream("/endbody-draftalert.txt"), "UTF-8");
             replacements.put("</body>", draftAlert);
             HtmlUtils.updateHtml(htmlDir, replacements);
         } catch (IOException e) {
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/Html.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/Html.java
index 97a484cf8a..c555065e17 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/Html.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/Html.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2014 ForgeRock AS
- * Portions copyright 2024 3A Systems LLC.
+ * Portions copyright 2024-2026 3A Systems LLC.
  */
 
 package org.forgerock.doc.maven.post;
@@ -131,7 +131,7 @@ public void execute() throws MojoExecutionException {
      */
     private void addScript() throws MojoExecutionException {
 
-        final URL scriptUrl = getClass().getResource("/js/" + m.getJavaScriptFileName());
+        final URL scriptUrl = Html.class.getResource("/js/" + m.getJavaScriptFileName());
         String scriptString;
         try {
             scriptString = IOUtils.toString(scriptUrl);
@@ -197,16 +197,16 @@ final void editBuiltHtml(final String htmlDir) throws MojoExecutionException {
             HashMap<String, String> replacements = new HashMap<>();
 
             String doctype = IOUtils.toString(
-                    getClass().getResourceAsStream("/starthtml-doctype.txt"), StandardCharsets.UTF_8);
+                    Html.class.getResourceAsStream("/starthtml-doctype.txt"), StandardCharsets.UTF_8);
             replacements.put("<html>", doctype);
 
             // See https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
             String robots = "<head>" + System.getProperty("line.separator")
-                    + IOUtils.toString(getClass().getResourceAsStream("/robots.txt"), StandardCharsets.UTF_8);
+                    + IOUtils.toString(Html.class.getResourceAsStream("/robots.txt"), StandardCharsets.UTF_8);
             replacements.put("<head>", robots);
 
             String favicon = IOUtils.toString(
-                    getClass().getResourceAsStream("/endhead-favicon.txt"), StandardCharsets.UTF_8);
+                    Html.class.getResourceAsStream("/endhead-favicon.txt"), StandardCharsets.UTF_8);
             favicon = favicon.replace("FAVICON-LINK", m.getFaviconLink());
             replacements.put("</head>", favicon);
 
@@ -215,7 +215,7 @@ final void editBuiltHtml(final String htmlDir) throws MojoExecutionException {
             String gascript = "";
             if(m.getGoogleAnalyticsId() != null && !"".equals(m.getGoogleAnalyticsId())) {
                 gascript = IOUtils.toString(
-                        getClass().getResourceAsStream("/endbody-ga.txt"), StandardCharsets.UTF_8);
+                        Html.class.getResourceAsStream("/endbody-ga.txt"), StandardCharsets.UTF_8);
                 gascript = gascript.replace("ANALYTICS-ID", m.getGoogleAnalyticsId());
             }
 
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/WebhelpPost.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/WebhelpPost.java
index 829480f57a..9a8bbdd7f9 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/WebhelpPost.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/WebhelpPost.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.doc.maven.post;
@@ -58,7 +59,7 @@ public void execute() throws MojoExecutionException {
         try {
             // See https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
             String robots = "<head>" + System.getProperty("line.separator")
-                    + IOUtils.toString(getClass().getResourceAsStream("/robots.txt"), "UTF-8");
+                    + IOUtils.toString(WebhelpPost.class.getResourceAsStream("/robots.txt"), "UTF-8");
             replacements.put("<head>", robots);
             HtmlUtils.updateHtml(webhelpDir.getPath(), replacements);
         } catch (IOException e) {
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/release/IndexHtml.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/release/IndexHtml.java
index f27b653299..a03af3760f 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/release/IndexHtml.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/release/IndexHtml.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2014 ForgeRock AS
- * Portions copyright 2024 3A Systems LLC.
+ * Portions copyright 2024-2026 3A Systems LLC.
  */
 
 package org.forgerock.doc.maven.release;
@@ -56,7 +56,7 @@ public void execute() throws MojoExecutionException {
             FileUtils.deleteQuietly(indexHtml);
 
             try {
-                String content = IOUtils.toString(getClass().getResource("/dfo.index.html"), StandardCharsets.UTF_8);
+                String content = IOUtils.toString(IndexHtml.class.getResource("/dfo.index.html"), StandardCharsets.UTF_8);
                 content = content.replace("PRODUCT", m.getProjectName().toLowerCase());
                 content = content.replace("VERSION", m.getReleaseVersion());
                 if(m.getGoogleAnalyticsId() != null) {
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/release/Robots.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/release/Robots.java
index 6bef5a9eb0..fd22964eb6 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/release/Robots.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/release/Robots.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.doc.maven.release;
@@ -54,7 +55,7 @@ public void execute() throws MojoExecutionException {
 
         try {
             final String robots = IOUtils.toString(
-                    getClass().getResourceAsStream("/robots.txt"), "UTF-8");
+                    Robots.class.getResourceAsStream("/robots.txt"), "UTF-8");
 
             replacements.put(robots, ""); // Replace the tag with an empty string.
             HtmlUtils.updateHtml(m.getReleaseVersionPath(), replacements);
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/site/Htaccess.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/site/Htaccess.java
index 58389ace0a..488378d734 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/site/Htaccess.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/site/Htaccess.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.doc.maven.site;
@@ -54,7 +55,7 @@ public void execute() throws MojoExecutionException {
 
         FileUtils.deleteQuietly(htaccess);
         try {
-            FileUtils.copyURLToFile(getClass().getResource("/.htaccess"), htaccess);
+            FileUtils.copyURLToFile(Htaccess.class.getResource("/.htaccess"), htaccess);
             HtmlUtils.addHtaccess(layoutDir, htaccess);
         } catch (IOException e) {
             throw new MojoExecutionException("Failed to copy .htaccess: " + e.getMessage(), e);
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/site/Redirect.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/site/Redirect.java
index 26fcde8b25..9e3993db2b 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/site/Redirect.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/site/Redirect.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.doc.maven.site;
@@ -52,7 +53,7 @@ public void execute() throws MojoExecutionException {
         try {
             File file = FileUtils.getFile(m.getSiteDirectory(), "doc", "index.html");
             if (!file.exists()) {
-                String redirect = IOUtils.toString(getClass().getResourceAsStream("/index.html"), "UTF-8");
+                String redirect = IOUtils.toString(Redirect.class.getResourceAsStream("/index.html"), "UTF-8");
                 redirect = redirect.replaceAll("PROJECT", m.getProjectName())
                         .replaceAll("LOWERCASE", m.getProjectName().toLowerCase());
                 FileUtils.write(file, redirect, "UTF-8");
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/BootstrapCopier.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/BootstrapCopier.java
index 2112d1a9e6..ed9b5a53eb 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/BootstrapCopier.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/BootstrapCopier.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.doc.maven.utils;
@@ -91,7 +92,7 @@ private void addBootstrapSwf() throws IOException {
     private void addBootstrapResources(final String[] resources) throws IOException {
 
         for (String resource : resources) {
-            URL resourceUrl = getClass().getResource(resource);
+            URL resourceUrl = BootstrapCopier.class.getResource(resource);
 
             // The html.stylesheet parameter should probably take URLs.
             // When local files are referenced,
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/SyntaxHighlighterCopier.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/SyntaxHighlighterCopier.java
index ff1c0936f7..4d763ca1b0 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/SyntaxHighlighterCopier.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/SyntaxHighlighterCopier.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.doc.maven.utils;
@@ -105,7 +106,7 @@ private void addShScripts() throws IOException {
     private void addShResources(final String[] resources) throws IOException {
 
         for (String resource : resources) {
-            URL resourceUrl = getClass().getResource(resource);
+            URL resourceUrl = SyntaxHighlighterCopier.class.getResource(resource);
 
             // The html.stylesheet parameter should probably take URLs.
             // When local files are referenced,
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/XmlTransformer.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/XmlTransformer.java
index dc62a4406e..089f9e4c82 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/XmlTransformer.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/XmlTransformer.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.doc.maven.utils;
@@ -96,7 +97,7 @@ public XmlTransformer(final String xsl, final FileFilter filterToMatch) {
     private Transformer getTransformer(final String xslResource)
             throws IOException, TransformerConfigurationException {
         TransformerFactory factory = TransformerFactory.newInstance();
-        Source xslt = new StreamSource(getClass().getResource(xslResource).openStream());
+        Source xslt = new StreamSource(XmlTransformer.class.getResource(xslResource).openStream());
         return factory.newTransformer(xslt);
     }
 
diff --git a/commons/doc-maven-plugin/src/main/java/org/openidentityplatform/doc/maven/AsciidocPreProcessMojo.java b/commons/doc-maven-plugin/src/main/java/org/openidentityplatform/doc/maven/AsciidocPreProcessMojo.java
index 2d3baa489f..6604ef8144 100644
--- a/commons/doc-maven-plugin/src/main/java/org/openidentityplatform/doc/maven/AsciidocPreProcessMojo.java
+++ b/commons/doc-maven-plugin/src/main/java/org/openidentityplatform/doc/maven/AsciidocPreProcessMojo.java
@@ -140,14 +140,14 @@ protected void setVersion(String version) throws IOException {
 
     private void copyResourcesFolder(String resFolder, File outputDir) throws Exception {
         List<Path> files;
-        URL partials = getClass().getResource(resFolder);
+        URL partials = AsciidocPreProcessMojo.class.getResource(resFolder);
         try (FileSystem fs = FileSystems.newFileSystem(partials.toURI(), Collections.emptyMap());
              Stream<Path> walk = Files.walk(fs.getPath(resFolder))) {
             files = walk.filter(Files::isRegularFile)
                     .collect(Collectors.toList());
         }
         for(Path file : files) {
-            try(InputStream stream = getClass().getResourceAsStream(file.toString())) {
+            try(InputStream stream = AsciidocPreProcessMojo.class.getResourceAsStream(file.toString())) {
                 File dest = new File(outputDir, file.getFileName().toString());
                 Files.copy(stream, dest.toPath(), StandardCopyOption.REPLACE_EXISTING);
             }
diff --git a/commons/doc-maven-plugin/src/main/java/org/openidentityplatform/doc/maven/AsciidocToPdfMojo.java b/commons/doc-maven-plugin/src/main/java/org/openidentityplatform/doc/maven/AsciidocToPdfMojo.java
index 3f348a33cb..4d8dbb5602 100644
--- a/commons/doc-maven-plugin/src/main/java/org/openidentityplatform/doc/maven/AsciidocToPdfMojo.java
+++ b/commons/doc-maven-plugin/src/main/java/org/openidentityplatform/doc/maven/AsciidocToPdfMojo.java
@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2024 3A Systems LLC.
+ * Copyright 2024-2026 3A Systems LLC.
  */
 
 package org.openidentityplatform.doc.maven;
@@ -82,7 +82,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
             }
 
-            final URL nestedOpenBlockExt = getClass().getResource("/asciidoc/extenstions/nested-open-block.rb");
+            final URL nestedOpenBlockExt = AsciidocToPdfMojo.class.getResource("/asciidoc/extenstions/nested-open-block.rb");
 
             executeMojo(
                     plugin(
diff --git a/commons/selfservice/example/src/main/java/org/forgerock/selfservice/example/ExampleSelfServiceApplication.java b/commons/selfservice/example/src/main/java/org/forgerock/selfservice/example/ExampleSelfServiceApplication.java
index b6c99d3ad2..7cad4acbf5 100644
--- a/commons/selfservice/example/src/main/java/org/forgerock/selfservice/example/ExampleSelfServiceApplication.java
+++ b/commons/selfservice/example/src/main/java/org/forgerock/selfservice/example/ExampleSelfServiceApplication.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.selfservice.example;
@@ -89,7 +90,7 @@ private void registerCRESTServices() throws ResourceException {
 
     private Handler buildHandler(String configResource) throws Exception {
         ObjectMapper mapper = new ObjectMapper();
-        JsonValue json = new JsonValue(mapper.readValue(getClass().getResource(configResource), Map.class));
+        JsonValue json = new JsonValue(mapper.readValue(ExampleSelfServiceApplication.class.getResource(configResource), Map.class));
 
         RequestHandler service = JsonAnonymousProcessServiceBuilder.newBuilder()
                 .withJsonConfig(json)
diff --git a/commons/util/util/src/main/java/org/forgerock/util/xml/XMLHandler.java b/commons/util/util/src/main/java/org/forgerock/util/xml/XMLHandler.java
index f5d0c79436..6dad8f16dc 100644
--- a/commons/util/util/src/main/java/org/forgerock/util/xml/XMLHandler.java
+++ b/commons/util/util/src/main/java/org/forgerock/util/xml/XMLHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.util.xml;
@@ -47,7 +48,7 @@ public InputSource resolveEntity(final String aPublicID, final String aSystemID)
 
         if (sysid.toLowerCase().startsWith("jar://")) {
             final String dtdname = sysid.substring(5);
-            final InputStream is = getClass().getResourceAsStream(dtdname);
+            final InputStream is = XMLHandler.class.getResourceAsStream(dtdname);
             if (is != null) {
                 return new InputSource(is);
             }