diff --git a/aws-kendra-datasource/.rpdk-config b/aws-kendra-datasource/.rpdk-config
index 73c5e02..824a676 100644
--- a/aws-kendra-datasource/.rpdk-config
+++ b/aws-kendra-datasource/.rpdk-config
@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::Kendra::DataSource",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java8.al2",
     "entrypoint": "software.amazon.kendra.datasource.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.kendra.datasource.HandlerWrapper::testEntrypoint",
     "settings": {
diff --git a/aws-kendra-datasource/template.yml b/aws-kendra-datasource/template.yml
index b21bde7..df8dc19 100644
--- a/aws-kendra-datasource/template.yml
+++ b/aws-kendra-datasource/template.yml
@@ -12,12 +12,12 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.kendra.datasource.HandlerWrapper::handleRequest
-      Runtime: java8
+      Runtime: java8.al2
       CodeUri: ./target/aws-kendra-datasource-handler-1.0-SNAPSHOT.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.kendra.datasource.HandlerWrapper::testEntrypoint
-      Runtime: java8
+      Runtime: java8.al2
       CodeUri: ./target/aws-kendra-datasource-handler-1.0-SNAPSHOT.jar
diff --git a/aws-kendra-faq/.rpdk-config b/aws-kendra-faq/.rpdk-config
index 03a6165..5c65ddd 100644
--- a/aws-kendra-faq/.rpdk-config
+++ b/aws-kendra-faq/.rpdk-config
@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::Kendra::Faq",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java8.al2",
     "entrypoint": "software.amazon.kendra.faq.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.kendra.faq.HandlerWrapper::testEntrypoint",
     "settings": {
@@ -12,8 +12,8 @@
             "kendra",
             "faq"
         ],
-	"codegen_template_path": "guided_aws",
-	"protocolVersion": "2.0.0"
+        "codegen_template_path": "guided_aws",
+        "protocolVersion": "2.0.0"
     },
     "logProcessorEnabled": "true",
     "executableEntrypoint": "software.amazon.kendra.faq.HandlerWrapperExecutable"
diff --git a/aws-kendra-faq/template.yml b/aws-kendra-faq/template.yml
index d2c6773..21e6db4 100644
--- a/aws-kendra-faq/template.yml
+++ b/aws-kendra-faq/template.yml
@@ -12,12 +12,12 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.kendra.faq.HandlerWrapper::handleRequest
-      Runtime: java8
+      Runtime: java8.al2
       CodeUri: ./target/aws-kendra-faq-handler-1.0-SNAPSHOT.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.kendra.faq.HandlerWrapper::testEntrypoint
-      Runtime: java8
+      Runtime: java8.al2
       CodeUri: ./target/aws-kendra-faq-handler-1.0-SNAPSHOT.jar
diff --git a/aws-kendra-featuredresultsset/.rpdk-config b/aws-kendra-featuredresultsset/.rpdk-config
index d42fe58..27f01f6 100644
--- a/aws-kendra-featuredresultsset/.rpdk-config
+++ b/aws-kendra-featuredresultsset/.rpdk-config
@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::Kendra::FeaturedResultsSet",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java8.al2",
     "entrypoint": "software.amazon.kendra.featuredresultsset.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.kendra.featuredresultsset.HandlerWrapper::testEntrypoint",
     "settings": {
@@ -24,5 +24,6 @@
         "codegen_template_path": "guided_aws",
         "protocolVersion": "2.0.0"
     },
+    "logProcessorEnabled": "true",
     "executableEntrypoint": "software.amazon.kendra.featuredresultsset.HandlerWrapperExecutable"
 }
diff --git a/aws-kendra-featuredresultsset/template.yml b/aws-kendra-featuredresultsset/template.yml
index cb8a28e..4a05dd8 100644
--- a/aws-kendra-featuredresultsset/template.yml
+++ b/aws-kendra-featuredresultsset/template.yml
@@ -12,12 +12,12 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.kendra.featuredresultsset.HandlerWrapper::handleRequest
-      Runtime: java8
+      Runtime: java8.al2
       CodeUri: ./target/aws-kendra-featuredresultsset-handler-1.0-SNAPSHOT.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.kendra.featuredresultsset.HandlerWrapper::testEntrypoint
-      Runtime: java8
+      Runtime: java8.al2
       CodeUri: ./target/aws-kendra-featuredresultsset-handler-1.0-SNAPSHOT.jar
diff --git a/aws-kendra-index/.rpdk-config b/aws-kendra-index/.rpdk-config
index 3422975..b2729fd 100644
--- a/aws-kendra-index/.rpdk-config
+++ b/aws-kendra-index/.rpdk-config
@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::Kendra::Index",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java8.al2",
     "entrypoint": "software.amazon.kendra.index.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.kendra.index.HandlerWrapper::testEntrypoint",
     "settings": {
diff --git a/aws-kendra-index/template.yml b/aws-kendra-index/template.yml
index 7e63df7..f1c0766 100644
--- a/aws-kendra-index/template.yml
+++ b/aws-kendra-index/template.yml
@@ -12,12 +12,12 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.kendra.index.HandlerWrapper::handleRequest
-      Runtime: java8
+      Runtime: java8.al2
       CodeUri: ./target/aws-kendra-index-handler-1.0-SNAPSHOT.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.kendra.index.HandlerWrapper::testEntrypoint
-      Runtime: java8
+      Runtime: java8.al2
       CodeUri: ./target/aws-kendra-index-handler-1.0-SNAPSHOT.jar