diff --git a/aws/cloudformation-template-ipsec b/aws/cloudformation-template-ipsec
index 04d0e58..4b71ca0 100644
--- a/aws/cloudformation-template-ipsec
+++ b/aws/cloudformation-template-ipsec
@@ -600,6 +600,10 @@
                             [
                                 "import boto3",
                                 "import cfnresponse",
+                                "'''",
+                                "This python script should be embeded into its designated cloudformation template.",
+                                "Its function is to sort out the correct AMI image to use for each of the distribution options available.",
+                                "'''",
                                 "def creation_date(e):",
                                 "   return e['CreationDate']",
                                 "",
@@ -608,16 +612,22 @@
                                 "       regionName = event['ResourceProperties']['Region']",
                                 "       distribution = event['ResourceProperties']['Distribution']",
                                 "       ec2 = boto3.client('ec2',regionName)",
-                                "       IAMName = ''",
-                                "       if distribution == 'Ubuntu16.04':",
-                                "           IAMName = 'ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-*'",
-                                "       elif distribution == 'Ubuntu18.04':",
-                                "           IAMName = 'ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*'",
-                                "       elif distribution == 'Ubuntu20.04':",
-                                "           IAMName = 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*'",
+                                "       AMIName = ''",
+                                "       if distribution == 'Ubuntu1604':",
+                                "           AMIName = 'ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-*'",
+                                "       elif distribution == 'Ubuntu1804':",
+                                "           AMIName = 'ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*'",
+                                "       elif distribution == 'Ubuntu2004':",
+                                "           AMIName = 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*'",
                                 "       elif distribution == 'Debian9':",
-                                "           IAMName = 'debian-stretch-hvm-x86_64-gp2-*'",
-                                "       response = ec2.describe_images(Filters=[{'Name':'name', 'Values':[IAMName]}], Owners=['099720109477', '379101102735'])",
+                                "           AMIName = 'debian-stretch-hvm-x86_64-gp2-*'",
+                                "       elif distribution == 'CentOS7':",
+                                "           AMIName = 'CentOS 7.9.2009 x86_64'",
+                                "       elif distribution == 'CentOS8':",
+                                "           AMIName = 'CentOS 8.3.2011 x86_64'",
+                                "       elif distribution == 'AmazonLinux2':",
+                                "           AMIName = 'amzn-ami-hvm-*'",
+                                "       response = ec2.describe_images(Filters=[{'Name':'name', 'Values':[AMIName]}], Owners=['099720109477', '379101102735', '125523088429', 'amazon'])",
                                 "       images = response['Images']",
                                 "       images.sort(key=creation_date,reverse=True)",
                                 "       AMIId = images[0]['ImageId']",