diff --git a/service/src/main/java/org/jboss/sbomer/service/feature/s3/S3ClientFacade.java b/service/src/main/java/org/jboss/sbomer/service/feature/s3/S3ClientFacade.java
index 451d31af8..9984ba21d 100644
--- a/service/src/main/java/org/jboss/sbomer/service/feature/s3/S3ClientFacade.java
+++ b/service/src/main/java/org/jboss/sbomer/service/feature/s3/S3ClientFacade.java
@@ -144,8 +144,8 @@ private void validateClientConfiguration() {
         for (String prop : Set.of("bucket.region", "bucket.name", "aws.access.key.id", "aws.secret.access.key")) {
             Optional<String> valueOpt = ConfigProvider.getConfig().getOptionalValue(prop, String.class);
 
-            if (!valueOpt.isPresent()) {
-                missingConfig.add(prop.toUpperCase().replaceAll("\\.", "_"));
+            if (valueOpt.isEmpty()) {
+                missingConfig.add(prop.toUpperCase().replace('.', '_'));
             }
         }
 
@@ -205,7 +205,7 @@ public List<String> logFileNames(String generationRequestId) {
             log.debug("Found: '{}'", object.key());
 
             if (object.key().contains("/logs/")) {
-                paths.add(object.key().replaceAll(generationRequestId + "/", ""));
+                paths.add(object.key().replace(generationRequestId + "/", ""));
             }
         }