diff --git a/unicorn_approvals/ApprovalsService/pom.xml b/unicorn_approvals/ApprovalsService/pom.xml
index 05d471b..31f0416 100644
--- a/unicorn_approvals/ApprovalsService/pom.xml
+++ b/unicorn_approvals/ApprovalsService/pom.xml
@@ -1,5 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>approval</groupId>
     <artifactId>ApprovalsService</artifactId>
@@ -7,10 +8,10 @@
     <packaging>jar</packaging>
     <name>Unicorn Approvals Service module</name>
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <aws.java.sdk.version>2.32.29</aws.java.sdk.version>
-        <aws.java.powertool.version>1.20.2</aws.java.powertool.version>
+        <aws.java.powertool.version>2.4.0</aws.java.powertool.version>
         <aws-lambda-java-events.version>3.16.1</aws-lambda-java-events.version>
         <mockito-core.version>5.18.0</mockito-core.version>
         <junit.version>4.13.2</junit.version>
@@ -35,6 +36,16 @@
             <artifactId>powertools-metrics</artifactId>
             <version>${aws.java.powertool.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.lambda</groupId>
+            <artifactId>powertools-logging-log4j</artifactId>
+            <version>${aws.java.powertool.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>1.9.22</version>
+        </dependency>
 
         <dependency>
             <groupId>com.amazonaws</groupId>
@@ -93,7 +104,7 @@
             <artifactId>jackson-annotations</artifactId>
             <version>2.18.4</version>
         </dependency>
-        
+
         <!-- Log4j -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -137,6 +148,7 @@
                     <environmentVariables>
                         <LAMBDA_TASK_ROOT>handler</LAMBDA_TASK_ROOT>
                         <CONTRACT_STATUS_TABLE>test-table</CONTRACT_STATUS_TABLE>
+                        <POWERTOOLS_METRICS_DISABLED>true</POWERTOOLS_METRICS_DISABLED>
                     </environmentVariables>
                 </configuration>
                 <dependencies>
@@ -165,10 +177,11 @@
             <plugin>
                 <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.14.1</version>
+                <version>1.14</version>
                 <configuration>
-                    <complianceLevel>17</complianceLevel>
-                    <release>17</release>
+                    <source>21</source>
+                    <target>21</target>
+                    <complianceLevel>21</complianceLevel>
                     <aspectLibraries>
                         <aspectLibrary>
                             <groupId>software.amazon.lambda</groupId>
@@ -182,8 +195,20 @@
                             <groupId>software.amazon.lambda</groupId>
                             <artifactId>powertools-metrics</artifactId>
                         </aspectLibrary>
+                        <aspectLibrary>
+                            <groupId>software.amazon.lambda</groupId>
+                            <artifactId>powertools-logging</artifactId>
+                        </aspectLibrary>
                     </aspectLibraries>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <!-- AspectJ compiler version, in sync with runtime -->
+                        <version>1.9.22</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <goals>
@@ -191,23 +216,16 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.aspectj</groupId>
-                        <artifactId>aspectjtools</artifactId>
-                        <version>1.9.24</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.14.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/unicorn_approvals/ApprovalsService/src/main/java/approvals/ContractStatusChangedHandlerFunction.java b/unicorn_approvals/ApprovalsService/src/main/java/approvals/ContractStatusChangedHandlerFunction.java
index 0d9f089..be4a55f 100644
--- a/unicorn_approvals/ApprovalsService/src/main/java/approvals/ContractStatusChangedHandlerFunction.java
+++ b/unicorn_approvals/ApprovalsService/src/main/java/approvals/ContractStatusChangedHandlerFunction.java
@@ -11,8 +11,8 @@
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
 import software.amazon.lambda.powertools.logging.Logging;
-import software.amazon.lambda.powertools.metrics.Metrics;
 import software.amazon.lambda.powertools.tracing.Tracing;
+import software.amazon.lambda.powertools.metrics.FlushMetrics;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -42,7 +42,7 @@ public class ContractStatusChangedHandlerFunction {
      * @throws IOException if there's an error processing the event
      */
     @Tracing
-    @Metrics(captureColdStart = true)
+    @FlushMetrics(captureColdStart = true)
     @Logging(logEvent = true)
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
         logger.info("TABLE_NAME environment variable: {}", TABLE_NAME);
diff --git a/unicorn_approvals/ApprovalsService/src/main/java/approvals/PropertiesApprovalSyncFunction.java b/unicorn_approvals/ApprovalsService/src/main/java/approvals/PropertiesApprovalSyncFunction.java
index afcfb45..26aae01 100644
--- a/unicorn_approvals/ApprovalsService/src/main/java/approvals/PropertiesApprovalSyncFunction.java
+++ b/unicorn_approvals/ApprovalsService/src/main/java/approvals/PropertiesApprovalSyncFunction.java
@@ -15,7 +15,7 @@
 import software.amazon.awssdk.services.sfn.SfnAsyncClient;
 import software.amazon.awssdk.services.sfn.model.SendTaskSuccessRequest;
 import software.amazon.lambda.powertools.logging.Logging;
-import software.amazon.lambda.powertools.metrics.Metrics;
+import software.amazon.lambda.powertools.metrics.FlushMetrics;
 import software.amazon.lambda.powertools.tracing.Tracing;
 
 import java.io.Serializable;
@@ -40,7 +40,7 @@ public class PropertiesApprovalSyncFunction implements RequestHandler<DynamodbEv
         .build();
 
     @Tracing
-    @Metrics(captureColdStart = true)
+    @FlushMetrics(captureColdStart = true)
     @Logging(logEvent = true)
     public StreamsEventResponse handleRequest(DynamodbEvent input, Context context) {
         List<StreamsEventResponse.BatchItemFailure> batchItemFailures = new ArrayList<>();
diff --git a/unicorn_approvals/ApprovalsService/src/main/java/approvals/WaitForContractApprovalFunction.java b/unicorn_approvals/ApprovalsService/src/main/java/approvals/WaitForContractApprovalFunction.java
index c1f5f3e..bc30635 100644
--- a/unicorn_approvals/ApprovalsService/src/main/java/approvals/WaitForContractApprovalFunction.java
+++ b/unicorn_approvals/ApprovalsService/src/main/java/approvals/WaitForContractApprovalFunction.java
@@ -11,7 +11,7 @@
 import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
 import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
 import software.amazon.lambda.powertools.logging.Logging;
-import software.amazon.lambda.powertools.metrics.Metrics;
+import software.amazon.lambda.powertools.metrics.FlushMetrics;
 import software.amazon.lambda.powertools.tracing.Tracing;
 
 import java.io.IOException;
@@ -38,7 +38,7 @@ public class WaitForContractApprovalFunction {
         .build();
 
     @Tracing
-    @Metrics(captureColdStart = true)
+    @FlushMetrics(captureColdStart = true)
     @Logging(logEvent = true)
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) 
             throws IOException, ContractStatusNotFoundException {
diff --git a/unicorn_contracts/ContractsService/pom.xml b/unicorn_contracts/ContractsService/pom.xml
index ebd87fd..45d2174 100644
--- a/unicorn_contracts/ContractsService/pom.xml
+++ b/unicorn_contracts/ContractsService/pom.xml
@@ -1,5 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>contracts</groupId>
   <artifactId>ContractsService</artifactId>
@@ -7,10 +8,10 @@
   <packaging>jar</packaging>
   <name>Unicorn Contracts Service module</name>
   <properties>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <aws.java.sdk.version>2.32.29</aws.java.sdk.version>
-    <aws.java.powertool.version>1.20.2</aws.java.powertool.version>
+    <aws.java.powertool.version>2.4.0</aws.java.powertool.version>
     <aws-lambda-java-events.version>3.16.1</aws-lambda-java-events.version>
     <mockito-core.version>5.18.0</mockito-core.version>
     <junit.version>4.13.2</junit.version>
@@ -32,14 +33,24 @@
       <artifactId>powertools-metrics</artifactId>
       <version>${aws.java.powertool.version}</version>
     </dependency>
-    
+    <dependency>
+        <groupId>software.amazon.lambda</groupId>
+        <artifactId>powertools-logging-log4j</artifactId>
+        <version>${aws.java.powertool.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.9.22</version>
+    </dependency>
+
     <!-- AWS Lambda Core -->
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-lambda-java-core</artifactId>
       <version>1.3.0</version>
     </dependency>
-    
+
     <!-- Jackson for JSON processing -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -56,7 +67,7 @@
       <artifactId>jackson-annotations</artifactId>
       <version>2.18.4</version>
     </dependency>
-    
+
     <!-- Log4j -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
@@ -128,6 +139,7 @@
           <useSystemClassLoader>false</useSystemClassLoader>
           <environmentVariables>
             <LAMBDA_TASK_ROOT>handler</LAMBDA_TASK_ROOT>
+            <POWERTOOLS_METRICS_DISABLED>true</POWERTOOLS_METRICS_DISABLED>
           </environmentVariables>
         </configuration>
         <dependencies>
@@ -154,13 +166,13 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>1.15.0</version>
+        <version>1.14</version>
         <configuration>
-          <complianceLevel>17</complianceLevel>
-          <source>17</source>
-          <target>17</target>
+          <source>21</source> 
+          <target>21</target> 
+          <complianceLevel>21</complianceLevel> 
           <aspectLibraries>
             <aspectLibrary>
               <groupId>software.amazon.lambda</groupId>
@@ -174,13 +186,18 @@
               <groupId>software.amazon.lambda</groupId>
               <artifactId>powertools-metrics</artifactId>
             </aspectLibrary>
+            <aspectLibrary>
+              <groupId>software.amazon.lambda</groupId>
+              <artifactId>powertools-logging</artifactId>
+            </aspectLibrary>
           </aspectLibraries>
         </configuration>
         <dependencies>
           <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjtools</artifactId>
-            <version>1.9.22.1</version>
+            <!-- AspectJ compiler version, in sync with runtime -->
+            <version>1.9.22</version>
           </dependency>
         </dependencies>
         <executions>
@@ -196,10 +213,10 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.14.0</version>
         <configuration>
-          <source>17</source>
-          <target>17</target>
+          <source>21</source>
+          <target>21</target>
         </configuration>
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/unicorn_contracts/ContractsService/src/main/java/contracts/ContractEventHandler.java b/unicorn_contracts/ContractsService/src/main/java/contracts/ContractEventHandler.java
index c1f2918..4de4200 100644
--- a/unicorn_contracts/ContractsService/src/main/java/contracts/ContractEventHandler.java
+++ b/unicorn_contracts/ContractsService/src/main/java/contracts/ContractEventHandler.java
@@ -12,7 +12,9 @@
 import org.apache.logging.log4j.Logger;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 import software.amazon.awssdk.services.dynamodb.model.*;
+import software.amazon.lambda.powertools.logging.Logging;
 import software.amazon.lambda.powertools.tracing.Tracing;
+import software.amazon.lambda.powertools.metrics.FlushMetrics;
 
 import java.time.Instant;
 import java.util.Map;
@@ -38,6 +40,8 @@ public ContractEventHandler(DynamoDbClient dynamodbClient) {
 
     @Override
     @Tracing
+    @FlushMetrics(captureColdStart = true)
+    @Logging(logEvent = true)
     public Void handleRequest(SQSEvent event, Context context) {
         if (event == null || event.getRecords() == null) {
             LOGGER.warn("Received null or empty SQS event");
diff --git a/unicorn_web/PublicationManagerService/pom.xml b/unicorn_web/PublicationManagerService/pom.xml
index ace1280..f88fb7d 100644
--- a/unicorn_web/PublicationManagerService/pom.xml
+++ b/unicorn_web/PublicationManagerService/pom.xml
@@ -1,5 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>approval</groupId>
     <artifactId>PublicationManagerService</artifactId>
@@ -7,10 +8,10 @@
     <packaging>jar</packaging>
     <name>Unicorn Web Approval Service module</name>
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <aws.java.sdk.version>2.32.29</aws.java.sdk.version>
-        <aws.java.powertool.version>1.20.2</aws.java.powertool.version>
+        <aws.java.powertool.version>2.4.0</aws.java.powertool.version>
         <aws-lambda-java-events.version>3.16.1</aws-lambda-java-events.version>
         <mockito-core.version>5.18.0</mockito-core.version>
         <junit.version>4.13.2</junit.version>
@@ -47,6 +48,17 @@
             <artifactId>powertools-metrics</artifactId>
             <version>${aws.java.powertool.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.lambda</groupId>
+            <artifactId>powertools-logging-log4j</artifactId>
+            <version>${aws.java.powertool.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>1.9.22</version>
+        </dependency>
+
         <dependency>
             <groupId>software.amazon.lambda</groupId>
             <artifactId>powertools-cloudformation</artifactId>
@@ -157,7 +169,6 @@
     </dependencies>
 
 
-
     <build>
         <plugins>
             <plugin>
@@ -167,6 +178,7 @@
                 <configuration>
                     <environmentVariables>
                         <LAMBDA_TASK_ROOT>handler</LAMBDA_TASK_ROOT>
+                        <POWERTOOLS_METRICS_DISABLED>true</POWERTOOLS_METRICS_DISABLED>
                     </environmentVariables>
                 </configuration>
             </plugin>
@@ -186,11 +198,13 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.15.0</version>
+                <version>1.14</version>
                 <configuration>
-                    <complianceLevel>17</complianceLevel>
+                    <source>21</source>
+                    <target>21</target>
+                    <complianceLevel>21</complianceLevel>
                     <aspectLibraries>
                         <aspectLibrary>
                             <groupId>software.amazon.lambda</groupId>
@@ -204,8 +218,20 @@
                             <groupId>software.amazon.lambda</groupId>
                             <artifactId>powertools-metrics</artifactId>
                         </aspectLibrary>
+                        <aspectLibrary>
+                            <groupId>software.amazon.lambda</groupId>
+                            <artifactId>powertools-logging</artifactId>
+                        </aspectLibrary>
                     </aspectLibraries>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <!-- AspectJ compiler version, in sync with runtime -->
+                        <version>1.9.22</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <goals>
@@ -213,23 +239,16 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.aspectj</groupId>
-                        <artifactId>aspectjtools</artifactId>
-                        <version>1.9.22.1</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.14.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/unicorn_web/PublicationManagerService/src/main/java/publicationmanager/PublicationEvaluationEventHandler.java b/unicorn_web/PublicationManagerService/src/main/java/publicationmanager/PublicationEvaluationEventHandler.java
index b8f3839..964cb3f 100644
--- a/unicorn_web/PublicationManagerService/src/main/java/publicationmanager/PublicationEvaluationEventHandler.java
+++ b/unicorn_web/PublicationManagerService/src/main/java/publicationmanager/PublicationEvaluationEventHandler.java
@@ -21,7 +21,7 @@
 import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
 import software.amazon.lambda.powertools.logging.Logging;
-import software.amazon.lambda.powertools.metrics.Metrics;
+import software.amazon.lambda.powertools.metrics.FlushMetrics;
 import software.amazon.lambda.powertools.tracing.Tracing;
 import schema.unicorn_approvals.publicationevaluationcompleted.marshaller.Marshaller;
 import schema.unicorn_approvals.publicationevaluationcompleted.AWSEvent;
@@ -51,7 +51,7 @@ public PublicationEvaluationEventHandler() {
     }
 
     @Tracing
-    @Metrics(captureColdStart = true)
+    @FlushMetrics(captureColdStart = true)
     @Logging(logEvent = true)
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
         try {
diff --git a/unicorn_web/PublicationManagerService/src/main/java/publicationmanager/RequestApprovalFunction.java b/unicorn_web/PublicationManagerService/src/main/java/publicationmanager/RequestApprovalFunction.java
index 76386fa..83773a1 100644
--- a/unicorn_web/PublicationManagerService/src/main/java/publicationmanager/RequestApprovalFunction.java
+++ b/unicorn_web/PublicationManagerService/src/main/java/publicationmanager/RequestApprovalFunction.java
@@ -36,7 +36,7 @@
 import software.amazon.awssdk.services.eventbridge.model.PutEventsRequest;
 import software.amazon.awssdk.services.eventbridge.model.PutEventsRequestEntry;
 import software.amazon.lambda.powertools.logging.Logging;
-import software.amazon.lambda.powertools.metrics.Metrics;
+import software.amazon.lambda.powertools.metrics.FlushMetrics;
 import software.amazon.lambda.powertools.tracing.Tracing;
 
 /**
@@ -73,7 +73,7 @@ public RequestApprovalFunction() {
     }
 
     @Tracing
-    @Metrics(captureColdStart = true)
+    @FlushMetrics(captureColdStart = true)
     @Logging(logEvent = true)
     public void handleRequest(final SQSEvent input, final Context context) {
         logger.info("Environment variables - DYNAMODB_TABLE: {}, EVENT_BUS: {}", tableName, eventBus);
@@ -183,7 +183,6 @@ private List<Property> queryTable(String partitionKey, String sortKey) throws Ex
     }
 
     @Tracing
-    @Metrics
     private void sendEvent(Property property) throws JsonProcessingException {
         logger.info("Creating approval event for property: {}", property.getId());
         
diff --git a/unicorn_web/SearchService/pom.xml b/unicorn_web/SearchService/pom.xml
index b627290..21b09f0 100644
--- a/unicorn_web/SearchService/pom.xml
+++ b/unicorn_web/SearchService/pom.xml
@@ -1,5 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>search</groupId>
     <artifactId>SearchService</artifactId>
@@ -7,10 +8,10 @@
     <packaging>jar</packaging>
     <name>Unicorn Web Search Service module</name>
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <aws.java.sdk.version>2.32.29</aws.java.sdk.version>
-        <aws.java.powertool.version>1.20.2</aws.java.powertool.version>
+        <aws.java.powertool.version>2.4.0</aws.java.powertool.version>
         <aws-lambda-java-events.version>3.16.1</aws-lambda-java-events.version>
         <mockito-core.version>5.18.0</mockito-core.version>
         <junit.version>4.13.2</junit.version>
@@ -52,16 +53,22 @@
             <artifactId>powertools-cloudformation</artifactId>
             <version>${aws.java.powertool.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.lambda</groupId>
+            <artifactId>powertools-logging-log4j</artifactId>
+            <version>${aws.java.powertool.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>1.9.22</version>
+        </dependency>
+
         <dependency>
             <groupId>software.amazon.cloudwatchlogs</groupId>
             <artifactId>aws-embedded-metrics</artifactId>
             <version>4.2.0</version>
         </dependency>
-        <!-- <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.5.1</version>
-        </dependency> -->
 
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
@@ -163,7 +170,6 @@
     </dependencies>
 
 
-
     <build>
         <plugins>
             <plugin>
@@ -173,6 +179,7 @@
                 <configuration>
                     <environmentVariables>
                         <LAMBDA_TASK_ROOT>handler</LAMBDA_TASK_ROOT>
+                        <POWERTOOLS_METRICS_DISABLED>true</POWERTOOLS_METRICS_DISABLED>
                     </environmentVariables>
                 </configuration>
             </plugin>
@@ -192,11 +199,13 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.15.0</version>
+                <version>1.14</version>
                 <configuration>
-                    <complianceLevel>17</complianceLevel>
+                    <source>21</source>
+                    <target>21</target>
+                    <complianceLevel>21</complianceLevel>
                     <aspectLibraries>
                         <aspectLibrary>
                             <groupId>software.amazon.lambda</groupId>
@@ -210,8 +219,20 @@
                             <groupId>software.amazon.lambda</groupId>
                             <artifactId>powertools-metrics</artifactId>
                         </aspectLibrary>
+                        <aspectLibrary>
+                            <groupId>software.amazon.lambda</groupId>
+                            <artifactId>powertools-logging</artifactId>
+                        </aspectLibrary>
                     </aspectLibraries>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <!-- AspectJ compiler version, in sync with runtime -->
+                        <version>1.9.22</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <goals>
@@ -219,23 +240,16 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.aspectj</groupId>
-                        <artifactId>aspectjtools</artifactId>
-                        <version>1.9.22.1</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.14.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/unicorn_web/SearchService/src/main/java/search/PropertySearchFunction.java b/unicorn_web/SearchService/src/main/java/search/PropertySearchFunction.java
index ba1da35..cb1804a 100644
--- a/unicorn_web/SearchService/src/main/java/search/PropertySearchFunction.java
+++ b/unicorn_web/SearchService/src/main/java/search/PropertySearchFunction.java
@@ -29,9 +29,10 @@
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 import software.amazon.awssdk.services.dynamodb.model.DynamoDbException;
+import software.amazon.lambda.powertools.metrics.FlushMetrics;
 import software.amazon.lambda.powertools.metrics.Metrics;
 import software.amazon.lambda.powertools.tracing.Tracing;
-import software.amazon.lambda.powertools.logging.CorrelationIdPathConstants;
+import software.amazon.lambda.powertools.logging.CorrelationIdPaths;
 import software.amazon.lambda.powertools.logging.Logging;
 
 /**
@@ -61,8 +62,8 @@ public PropertySearchFunction() {
     }
 
     @Tracing
-    @Metrics(captureColdStart = true)
-    @Logging(logEvent = true, correlationIdPath = CorrelationIdPathConstants.API_GATEWAY_REST)
+    @FlushMetrics(captureColdStart = true)
+    @Logging(logEvent = true, correlationIdPath = CorrelationIdPaths.API_GATEWAY_REST)
     public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent input, final Context context) {
         try {
             if (!"GET".equalsIgnoreCase(input.getHttpMethod())) {
diff --git a/unicorn_web/pom.xml b/unicorn_web/pom.xml
index d6e816a..f5c39c4 100644
--- a/unicorn_web/pom.xml
+++ b/unicorn_web/pom.xml
@@ -12,8 +12,8 @@
     <name>Unicorn Web Services</name>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>