diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
index bc135be..80860b9 100644
--- a/.github/workflows/build-and-publish.yaml
+++ b/.github/workflows/build-and-publish.yaml
@@ -5,23 +5,30 @@ on:
     inputs:
       release_type:
         type: choice
-        description: The type of release
+        description: 'The type of release'
         options:
-        - Major
-        - Minor
-        - Patch
         - Snapshot
+        - Patch
+        - Minor
+        - Major
+      vulnerability_failure_severity:
+        description: The severity to fail the workflow if such vulnerability is detected. DO NOT override it unless a Jira ticket is raised.
+        type: choice
+        options:
+        - CRITICAL,HIGH
+        - CRITICAL,HIGH,MEDIUM
+        - CRITICAL (DO NOT use if JIRA ticket not raised)
       publish_to_maven:
-        description: True to publish the artifacts to Maven repository, false to skip the step
-        default: false
+        description: 'True to publish the artifacts to Maven repository, false to skip the step'
+        default: true
         required: false
         type: boolean
       java_version:
         type: string
-        default: 11
+        default: '21'
       publish_vulnerabilities:
         type: string
-        default: true
+        default: 'true'
 
 jobs:
   build-and-pubish:
@@ -32,5 +39,6 @@ jobs:
       publish_to_maven: ${{ inputs.publish_to_maven }}
       java_version: ${{ inputs.java_version }}
       publish_vulnerabilities: ${{ inputs.publish_vulnerabilities }}
+      vulnerability_failure_severity: ${{ inputs.vulnerability_failure_severity }}
       working_dir: attestation-aws
     secrets: inherit
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 4d63f6a..44d6005 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -7,3 +7,4 @@ jobs:
     secrets: inherit
     with:
       working_dir: attestation-aws/
+      java_version: 21
diff --git a/attestation-aws/pom.xml b/attestation-aws/pom.xml
index 2399f80..70a4da3 100644
--- a/attestation-aws/pom.xml
+++ b/attestation-aws/pom.xml
@@ -1,156 +1,170 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.uid2</groupId>
-    <artifactId>attestation-aws</artifactId>
-    <version>2.0.0-f7c174410e</version>
+  <groupId>com.uid2</groupId>
+  <artifactId>attestation-aws</artifactId>
+  <version>2.0.0-f7c174410e</version>
 
-    <name>${project.groupId}:${project.artifactId}</name>
-    <description>AWS Enclave attestation</description>
-    <url>https://github.com/IABTechLab/uid2docs</url>
-    <packaging>jar</packaging>
+  <name>${project.groupId}:${project.artifactId}</name>
+  <description>AWS Enclave attestation</description>
+  <url>https://github.com/IABTechLab/uid2docs</url>
+  <packaging>jar</packaging>
 
-    <licenses>
-      <license>
-        <name>The Apache License, Version 2.0</name>
-        <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      </license>
-    </licenses>
+  <licenses>
+    <license>
+      <name>The Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
 
-    <developers>
-        <developer>
-            <name>UID2 team</name>
-            <email>unifiedid-admin@thetradedesk.com</email>
-            <organization>UID</organization>
-            <organizationUrl>https://github.com/IABTechLab/uid2docs</organizationUrl>
-        </developer>
-    </developers>
-    <scm>
-      <connection>scm:get:ssh://github.com:IABTechLab/nsm-java.git</connection>
-      <developerConnection>scm:get:ssh://github.com:IABTechLab/nsm-java.git</developerConnection>
-      <url>https://github.com/IABTechLab/nsm-java</url>
-    </scm>
-    <dependencies>
-        <dependency>
-            <groupId>com.uid2</groupId>
-            <artifactId>uid2-attestation-api</artifactId>
-            <version>2.0.0-f968aec0e3</version>
-        </dependency>
-    </dependencies>
+  <developers>
+    <developer>
+      <name>UID2 team</name>
+      <email>unifiedid-admin@thetradedesk.com</email>
+      <organization>UID</organization>
+      <organizationUrl>https://github.com/IABTechLab/uid2docs</organizationUrl>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:get:ssh://github.com:IABTechLab/nsm-java.git</connection>
+    <developerConnection>scm:get:ssh://github.com:IABTechLab/nsm-java.git</developerConnection>
+    <url>https://github.com/IABTechLab/nsm-java</url>
+  </scm>
+  <properties>
+    <image.version>${project.version}</image.version>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
+    <java.version>21</java.version>
+  </properties>
 
-    <repositories>
-        <repository>
-            <id>snapshots-repo</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-            <releases><enabled>false</enabled></releases>
-            <snapshots><enabled>true</enabled></snapshots>
-        </repository>
-    </repositories>
-    <distributionManagement>
-      <snapshotRepository>
-        <id>ossrh</id>
-        <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-      </snapshotRepository>
-    </distributionManagement>
+  <dependencies>
+    <dependency>
+      <groupId>com.uid2</groupId>
+      <artifactId>uid2-attestation-api</artifactId>
+      <version>2.1.6</version>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>6</source>
-                    <target>6</target>
-                </configuration>
-            </plugin>       
-	    <plugin>
-	      <groupId>org.sonatype.plugins</groupId>
-	      <artifactId>nexus-staging-maven-plugin</artifactId>
-	      <version>1.6.7</version>
-	      <extensions>true</extensions>
-	      <configuration>
-	         <serverId>ossrh</serverId>
-	         <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-	         <autoReleaseAfterClose>false</autoReleaseAfterClose>
-	      </configuration>
-	    </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                <execution>
-                    <id>attach-sources</id>
-                    <goals>
-                    <goal>jar</goal>
-                    </goals>
-                </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.5</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-      	    <plugin>
-      	      <groupId>org.apache.maven.plugins</groupId>
-      	      <artifactId>maven-javadoc-plugin</artifactId>
-      	      <version>3.3.2</version>
-	      <executions>
-                <execution>
-                  <id>attach-javadocs</id>
-                    <goals>
-                      <goal>jar</goal>
-                    </goals>
-                </execution>
-              </executions>
-      	    </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>properties-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <executions>
-                    <execution>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>write-project-properties</goal>
-                        </goals>
-                        <configuration>
-                            <outputFile>${project.build.outputDirectory}/${project.artifactId}.properties</outputFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-    	    <plugin>
-    	      <groupId>org.apache.maven.plugins</groupId>
-    	      <artifactId>maven-gpg-plugin</artifactId>
-    	      <version>3.0.1</version>
-    	      <executions>
-    	        <execution>
-    	          <id>sign-artifacts</id>
-    	          <phase>verify</phase>
-    	          <goals>
-    	            <goal>sign</goal>
-    	          </goals>
-    	        </execution>
-    	      </executions>
-    	    </plugin>
-        </plugins>
-    </build>
+  <repositories>
+    <repository>
+      <id>snapshots-repo</id>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+  <distributionManagement>
+    <snapshotRepository>
+      <id>ossrh</id>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.12</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.13.0</version>
+        <configuration>
+          <source>21</source>
+          <target>21</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.7.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>false</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>3.3.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.8.0</version>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>properties-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>write-project-properties</goal>
+            </goals>
+            <configuration>
+              <outputFile>${project.build.outputDirectory}/${project.artifactId}.properties</outputFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <version>3.2.4</version>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>