diff --git a/backup/deployments.yaml b/backup/deployments.yaml
index 79a4710..5c8147e 100644
--- a/backup/deployments.yaml
+++ b/backup/deployments.yaml
@@ -149,7 +149,7 @@ spec:
           mountPath: /home/igs
       containers:
       - name: validator-api
-        image: pavelrozhkov/wrapper:6.3.11
+        image: ghcr.io/beda-software/validator-wrapper:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 3500
diff --git a/infra/aws-impl/tfvars/prod.tfvars b/infra/aws-impl/tfvars/prod.tfvars
index 96a815a..1d2ab81 100644
--- a/infra/aws-impl/tfvars/prod.tfvars
+++ b/infra/aws-impl/tfvars/prod.tfvars
@@ -3,7 +3,7 @@ environment = "prod"
 # imageUrl             = "ghcr.io/hl7au/au-fhir-core-inferno:bb8de66a310a6dcb800b71e9da83a2a6221346c3" # old working core image
 imageUrl                = "ghcr.io/hl7au/au-fhir-inferno:f8d23a2bcf6c6f94cfb74528107208ff2cd51e2e"       # use the image that is not tagged with -nginx
 platformImageUri        = "ghcr.io/hl7au/au-fhir-inferno:f8d23a2bcf6c6f94cfb74528107208ff2cd51e2e-nginx" # use the image that IS tagged with -nginx
-validatorImageUri       = "pavelrozhkov/wrapper:6.3.11"
+validatorImageUri       = "ghcr.io/beda-software/validator-wrapper:latest"
 usesWrapper             = true
 cluster_name            = "sparked-k8s"
 vpc_name                = "sparked-k8s-vpc"
diff --git a/infra/aws-impl/variables.tf b/infra/aws-impl/variables.tf
index 20ee48f..3a0e702 100644
--- a/infra/aws-impl/variables.tf
+++ b/infra/aws-impl/variables.tf
@@ -41,7 +41,7 @@ variable "platformImageUri" {
 variable "validatorImageUri" {
   description = "Validator Image URI"
   type        = string
-  default     = "pavelrozhkov/wrapper:6.3.11"
+  default     = "ghcr.io/beda-software/validator-wrapper:latest"
 
 }
 
diff --git a/infra/helm/inferno/templates/deployments/validator-api.deployment.yaml b/infra/helm/inferno/templates/deployments/validator-api.deployment.yaml
index 8b96656..5784e6f 100644
--- a/infra/helm/inferno/templates/deployments/validator-api.deployment.yaml
+++ b/infra/helm/inferno/templates/deployments/validator-api.deployment.yaml
@@ -46,5 +46,5 @@ spec:
             memory: "512Mi"   # Minimum memory required for scheduling
             cpu: "250m"       # Minimum CPU required for scheduling
           limits:
-            memory: "1Gi"     # Maximum memory usage allowed
+            memory: "10Gi"     # Maximum memory usage allowed
             cpu: "500m"       # Maximum CPU usage allowed
diff --git a/infra/helm/inferno/values.yaml b/infra/helm/inferno/values.yaml
index 7a9122a..ba18c1c 100644
--- a/infra/helm/inferno/values.yaml
+++ b/infra/helm/inferno/values.yaml
@@ -7,7 +7,7 @@ inferno:
   imageUrl: "ghcr.io/hl7au/au-fhir-inferno:68270162fcc1997a9ffac63c78530921bf0f32cf"
   terminologyServer: "https://tx.dev.hl7.org.au/fhir"
   externalValidatorUrl: null  # This can be overridden during chart deployment
-  validatorImageUri: "pavelrozhkov/wrapper:6.3.11"
+  validatorImageUri: "ghcr.io/beda-software/validator-wrapper:latest"
 
 controller:
   enabled: false # Set to true to enable the ingress controller if you have not already installed it, multiple ingress controllers can be installed via https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/