diff --git a/pom.xml b/pom.xml
index 5cd33af6a..f57a849e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-    <version>5.62.24</version>
+    <version>5.62.38</version>
   
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/scripts/aws/EUID_CloudFormation.template.yml b/scripts/aws/EUID_CloudFormation.template.yml
index 09fefb18f..30f12aea4 100644
--- a/scripts/aws/EUID_CloudFormation.template.yml
+++ b/scripts/aws/EUID_CloudFormation.template.yml
@@ -38,6 +38,8 @@ Parameters:
       - m6i.4xlarge
       - r6i.2xlarge
       - r6i.4xlarge
+      - r7i.2xlarge
+      - r7i.4xlarge
     ConstraintDescription: must be a valid EC2 instance type.
   RootVolumeSize:
     Description: Instance root volume size
@@ -90,7 +92,7 @@ Metadata:
       DeployToEnvironment:
         default: EUID environment to deploy to. Prod - production; Integ - integration test.
       InstanceType:
-        default: Instance Type for EC2. Minimum 4 vCPUs needed. M5, M5a, M5n, M6i and R6i Instance types are tested. Choose 2xlarge or 4xlarge.
+        default: Instance Type for EC2. Minimum 8 vCPUs needed. M5, M5a, M5n, M6i, R6i and R7i Instance types are tested. Choose 2xlarge or 4xlarge.
       SSHKeyName:
         default: Key Name for SSH to EC2 (required)
       RootVolumeSize:
diff --git a/scripts/aws/UID_CloudFormation.template.yml b/scripts/aws/UID_CloudFormation.template.yml
index 58030f4d2..82ab2c1dc 100644
--- a/scripts/aws/UID_CloudFormation.template.yml
+++ b/scripts/aws/UID_CloudFormation.template.yml
@@ -92,7 +92,7 @@ Metadata:
       DeployToEnvironment:
         default: UID2 environment to deploy to. Prod - production; Integ - integration test.
       InstanceType:
-        default: Instance Type for EC2. Minimum 4 vCPUs needed. M5, M5a, M5n, M6i and R6i Instance types are tested. Choose 2xlarge or 4xlarge.
+        default: Instance Type for EC2. Minimum 8 vCPUs needed. M5, M5a, M5n, M6i, R6i and R7i Instance types are tested. Choose 2xlarge or 4xlarge.
       SSHKeyName:
         default: Key Name for SSH to EC2 (required)
       RootVolumeSize:
diff --git a/scripts/azure-aks/deployment/operator.yaml b/scripts/azure-aks/deployment/operator.yaml
index 234bd4a23..bc6e752d6 100644
--- a/scripts/azure-aks/deployment/operator.yaml
+++ b/scripts/azure-aks/deployment/operator.yaml
@@ -39,7 +39,11 @@ spec:
           image: IMAGE_PLACEHOLDER
           resources:
             limits:
-              memory: "8Gi"
+              cpu: "6"
+              memory: "24Gi"
+            requests:
+              cpu: "6"
+              memory: "24Gi"
           imagePullPolicy: Always
           securityContext:
             runAsUser: 1000
diff --git a/scripts/azure-cc/deployment/operator.json b/scripts/azure-cc/deployment/operator.json
index 43d395c1b..60cf08d11 100644
--- a/scripts/azure-cc/deployment/operator.json
+++ b/scripts/azure-cc/deployment/operator.json
@@ -116,8 +116,8 @@
               ],
               "resources": {
                 "requests": {
-                  "cpu": 3.5,
-                  "memoryInGB": 15.5
+                  "cpu": 6,
+                  "memoryInGB": 24
                 }
               },
               "environmentVariables": [
diff --git a/src/main/resources/com.uid2.core/test/salts/metadata.json b/src/main/resources/com.uid2.core/test/salts/metadata.json
index 06313d890..3470f9a91 100644
--- a/src/main/resources/com.uid2.core/test/salts/metadata.json
+++ b/src/main/resources/com.uid2.core/test/salts/metadata.json
@@ -7,12 +7,12 @@
   "salts" : [
     {
       "effective" : 1670796729291,
-      "expires" : 1766125493000,
+      "expires" : 253370793600000,
       "location" : "/com.uid2.core/test/salts/salts.txt.1670796729291",
       "size" : 5
     },{
       "effective" : 1745907348982,
-      "expires" : 1766720293000,
+      "expires" : 253402329599000,
       "location" : "/com.uid2.core/test/salts/salts.txt.1745907348982",
       "size" : 5
     }