diff --git a/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-central-1.yml b/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-central-1.yml
index b254501bd2..b4148e586b 100644
--- a/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-central-1.yml
+++ b/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-central-1.yml
@@ -11,9 +11,9 @@ connection:
 inputs:
    - name: 'aws_ami_image'
      type: 'list'
-     default: 'ami-04505e74c0741db8d'
+     default: 'ami-0498a49a15494604f'
      options:
-       - 'ami-04505e74c0741db8d'
+       - 'ami-0498a49a15494604f'
    - name: 'aws_instance_type'
      type: 'list'
      default: 'c5.metal'
diff --git a/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-west-2.yml b/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-west-2.yml
index 08be004f0b..abcba7d971 100644
--- a/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-west-2.yml
+++ b/share/oneprovision/edge-clusters/metal/providers/aws/aws-eu-west-2.yml
@@ -11,9 +11,9 @@ connection:
 inputs:
    - name: 'aws_ami_image'
      type: 'list'
-     default: 'ami-04505e74c0741db8d'
+     default: 'ami-01d912b5940be07a5'
      options:
-       - 'ami-04505e74c0741db8d'
+       - 'ami-01d912b5940be07a5'
    - name: 'aws_instance_type'
      type: 'list'
      default: 'c5.metal'
diff --git a/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-east-1.yml b/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-east-1.yml
index 2bbea0ba35..8cff4bb108 100644
--- a/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-east-1.yml
+++ b/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-east-1.yml
@@ -11,9 +11,9 @@ connection:
 inputs:
    - name: 'aws_ami_image'
      type: 'list'
-     default: 'ami-04505e74c0741db8d'
+     default: 'ami-01896de1f162f0ab7'
      options:
-       - 'ami-04505e74c0741db8d'
+       - 'ami-01896de1f162f0ab7'
    - name: 'aws_instance_type'
      type: 'list'
      default: 'c5.metal'
diff --git a/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-west-1.yml b/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-west-1.yml
index f3cc943ef3..abb2493e34 100644
--- a/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-west-1.yml
+++ b/share/oneprovision/edge-clusters/metal/providers/aws/aws-us-west-1.yml
@@ -11,9 +11,9 @@ connection:
 inputs:
    - name: 'aws_ami_image'
      type: 'list'
-     default: 'ami-04505e74c0741db8d'
+     default: 'ami-0189702ff9c0b592f'
      options:
-       - 'ami-04505e74c0741db8d'
+       - 'ami-0189702ff9c0b592f'
    - name: 'aws_instance_type'
      type: 'list'
      default: 'c5.metal'
diff --git a/share/oneprovision/edge-clusters/metal/provisions/aws.d/inputs.yml b/share/oneprovision/edge-clusters/metal/provisions/aws.d/inputs.yml
index e3498e867c..7cf4d8520e 100644
--- a/share/oneprovision/edge-clusters/metal/provisions/aws.d/inputs.yml
+++ b/share/oneprovision/edge-clusters/metal/provisions/aws.d/inputs.yml
@@ -34,7 +34,6 @@ inputs:
   - name: 'aws_ami_image'
     type: text
     description: 'AWS ami image used for host deployments'
-    default: 'ami-04505e74c0741db8d'
 
   - name: 'aws_instance_type'
     type: text
diff --git a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-central-1.yml b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-central-1.yml
index f1e9e77242..79dbcc11c7 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-central-1.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-central-1.yml
@@ -11,9 +11,9 @@ connection:
 inputs:
    - name: 'aws_ami_image'
      type: 'list'
-     default: 'ami-04505e74c0741db8d'
+     default: 'ami-0498a49a15494604f'
      options:
-       - 'ami-04505e74c0741db8d'
+       - 'ami-0498a49a15494604f'
    - name: 'aws_instance_type'
      type: 'list'
      default: 't2.micro'
diff --git a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-west-2.yml b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-west-2.yml
index ea4372b24c..9ec1e22bd4 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-west-2.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-eu-west-2.yml
@@ -11,9 +11,9 @@ connection:
 inputs:
    - name: 'aws_ami_image'
      type: 'list'
-     default: 'ami-04505e74c0741db8d'
+     default: 'ami-0b0e59a09e7f4059f'
      options:
-       - 'ami-04505e74c0741db8d'
+       - 'ami-0b0e59a09e7f4059f'
    - name: 'aws_instance_type'
      type: 'list'
      default: 't2.micro'
diff --git a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-east-1.yml b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-east-1.yml
index 1186a1b1a0..0fc25f7c0e 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-east-1.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-east-1.yml
@@ -11,9 +11,9 @@ connection:
 inputs:
    - name: 'aws_ami_image'
      type: 'list'
-     default: 'ami-04505e74c0741db8d'
+     default: 'ami-01896de1f162f0ab7'
      options:
-       - 'ami-04505e74c0741db8d'
+       - 'ami-01896de1f162f0ab7'
    - name: 'aws_instance_type'
      type: 'list'
      default: 't2.micro'
diff --git a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-west-1.yml b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-west-1.yml
index c3e3f0bb86..a5a13c05f4 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-west-1.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/aws/aws-us-west-1.yml
@@ -11,9 +11,9 @@ connection:
 inputs:
    - name: 'aws_ami_image'
      type: 'list'
-     default: 'ami-04505e74c0741db8d'
+     default: 'ami-0189702ff9c0b592f'
      options:
-       - 'ami-04505e74c0741db8d'
+       - 'ami-0189702ff9c0b592f'
    - name: 'aws_instance_type'
      type: 'list'
      default: 't2.micro'
diff --git a/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml b/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml
index 20f3ab9d28..2c4bc0d02f 100644
--- a/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml
+++ b/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml
@@ -34,7 +34,6 @@ inputs:
   - name: 'aws_ami_image'
     type: text
     description: 'AWS ami image used for host deployments'
-    default: 'ami-04505e74c0741db8d'
 
   - name: 'aws_instance_type'
     type: text