diff --git a/01_05_base/main.tf b/01_05_base/main.tf
index e8f85d8..4845fd2 100644
--- a/01_05_base/main.tf
+++ b/01_05_base/main.tf
@@ -132,7 +132,7 @@ data "aws_ami" "aws-linux" {
 
   filter {
     name   = "name"
-    values = ["amzn-ami-hvm*"]
+    values = ["amzn2-ami-hvm*"]
   }
 
   filter {
diff --git a/02_02-07_variables/main.tf b/02_02-07_variables/main.tf
index e2bea6c..486f589 100644
--- a/02_02-07_variables/main.tf
+++ b/02_02-07_variables/main.tf
@@ -163,7 +163,7 @@ data "aws_ami" "aws-linux" {
 
   filter {
     name   = "name"
-    values = ["amzn-ami-hvm*"]
+    values = ["amzn2-ami-hvm*"]
   }
 
   filter {
diff --git a/02_08-09_expressions_functions/main.tf b/02_08-09_expressions_functions/main.tf
index e2bea6c..486f589 100644
--- a/02_08-09_expressions_functions/main.tf
+++ b/02_08-09_expressions_functions/main.tf
@@ -163,7 +163,7 @@ data "aws_ami" "aws-linux" {
 
   filter {
     name   = "name"
-    values = ["amzn-ami-hvm*"]
+    values = ["amzn2-ami-hvm*"]
   }
 
   filter {
diff --git a/02_10_count/main.tf b/02_10_count/main.tf
index f96932b..5e41d43 100644
--- a/02_10_count/main.tf
+++ b/02_10_count/main.tf
@@ -168,7 +168,7 @@ data "aws_ami" "aws-linux" {
 
   filter {
     name   = "name"
-    values = ["amzn-ami-hvm*"]
+    values = ["amzn2-ami-hvm*"]
   }
 
   filter {
diff --git a/02_11-12_modules/main.tf b/02_11-12_modules/main.tf
index f58a102..cfcf2c1 100644
--- a/02_11-12_modules/main.tf
+++ b/02_11-12_modules/main.tf
@@ -83,7 +83,7 @@ data "aws_ami" "aws-linux" {
 
   filter {
     name   = "name"
-    values = ["amzn-ami-hvm*"]
+    values = ["amzn2-ami-hvm*"]
   }
 
   filter {
diff --git a/03_04_complex/datasource.tf b/03_04_complex/datasource.tf
index d12005a..57f987f 100644
--- a/03_04_complex/datasource.tf
+++ b/03_04_complex/datasource.tf
@@ -7,7 +7,7 @@ data "aws_ami" "aws-linux" {
 
   filter {
     name   = "name"
-    values = ["amzn-ami-hvm*"]
+    values = ["amzn2-ami-hvm*"]
   }
 
   filter {
diff --git a/04_04_terraform_cloud_cli/datasource.tf b/04_04_terraform_cloud_cli/datasource.tf
index d12005a..57f987f 100644
--- a/04_04_terraform_cloud_cli/datasource.tf
+++ b/04_04_terraform_cloud_cli/datasource.tf
@@ -7,7 +7,7 @@ data "aws_ami" "aws-linux" {
 
   filter {
     name   = "name"
-    values = ["amzn-ami-hvm*"]
+    values = ["amzn2-ami-hvm*"]
   }
 
   filter {