diff --git a/demo-2b/ami.tf b/demo-2b/ami.tf
new file mode 100644
index 0000000..97086d8
--- /dev/null
+++ b/demo-2b/ami.tf
@@ -0,0 +1,22 @@
+# data source to retrieve windows AMI
+data "aws_ami" "windows-ami" {
+  most_recent      = true
+  owners           = ["amazon"]
+
+  filter {
+    name   = "name"
+    values = ["Windows_Server-2019-English-Full-Base-2020.08.12"]
+  }
+
+  filter {
+    name   = "virtualization-type"
+    values = ["hvm"]
+  }
+
+  filter {
+    name   = "architecture"
+    values = ["x86_64"]
+  }
+}
+
+
diff --git a/demo-2b/vars.tf b/demo-2b/vars.tf
index df1a83d..bf9623c 100644
--- a/demo-2b/vars.tf
+++ b/demo-2b/vars.tf
@@ -8,14 +8,15 @@ variable "AWS_REGION" {
   default = "eu-west-1"
 }
 
-variable "WIN_AMIS" {
-  type = map(string)
-  default = {
-    us-east-1 = "ami-30540427"
-    us-west-2 = "ami-9f5efbff"
-    eu-west-1 = "ami-7ac78809"
-  }
-}
+# Note: WIN_AMIS is now Replaced by ami.tf
+#variable "WIN_AMIS" {
+#  type = map(string)
+#  default = {
+#    us-east-1 = "ami-30540427"
+#    us-west-2 = "ami-9f5efbff"
+#    eu-west-1 = "ami-7ac78809"
+#  }
+#}
 
 variable "PATH_TO_PRIVATE_KEY" {
   default = "mykey"
diff --git a/demo-2b/windows-instance.tf b/demo-2b/windows-instance.tf
index a71f743..e3fb9c2 100644
--- a/demo-2b/windows-instance.tf
+++ b/demo-2b/windows-instance.tf
@@ -4,7 +4,7 @@ resource "aws_key_pair" "mykey" {
 }
 
 resource "aws_instance" "win-example" {
-  ami           = var.WIN_AMIS[var.AWS_REGION]
+  ami           = data.aws_ami.windows-ami.image_id
   instance_type = "t2.micro"
   key_name      = aws_key_pair.mykey.key_name
   user_data     = <<EOF