diff --git a/aws-amplifyuibuilder-component/.rpdk-config b/aws-amplifyuibuilder-component/.rpdk-config
index 9c8ad56..b5da838 100644
--- a/aws-amplifyuibuilder-component/.rpdk-config
+++ b/aws-amplifyuibuilder-component/.rpdk-config
@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::AmplifyUIBuilder::Component",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java11",
     "entrypoint": "software.amazon.amplifyuibuilder.component.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.amplifyuibuilder.component.HandlerWrapper::testEntrypoint",
     "settings": {
@@ -12,6 +12,10 @@
         "force": false,
         "type_name": null,
         "artifact_type": null,
+        "endpoint_url": null,
+        "region": null,
+        "target_schemas": [],
+        "profile": null,
         "namespace": [
             "software",
             "amazon",
@@ -21,5 +25,6 @@
         "codegen_template_path": "guided_aws",
         "protocolVersion": "2.0.0"
     },
+    "logProcessorEnabled": "true",
     "executableEntrypoint": "software.amazon.amplifyuibuilder.component.HandlerWrapperExecutable"
 }
diff --git a/aws-amplifyuibuilder-component/template.yml b/aws-amplifyuibuilder-component/template.yml
index ec18696..c32d41b 100644
--- a/aws-amplifyuibuilder-component/template.yml
+++ b/aws-amplifyuibuilder-component/template.yml
@@ -4,7 +4,7 @@ Description: AWS SAM template for the AWS::AmplifyUIBuilder::Component resource
 
 Globals:
   Function:
-    Timeout: 180  # docker start-up times can be long for SAM CLI
+    Timeout: 180 # docker start-up times can be long for SAM CLI
     MemorySize: 256
 
 Resources:
@@ -12,12 +12,12 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.amplifyuibuilder.component.HandlerWrapper::handleRequest
-      Runtime: java8
+      Runtime: java11
       CodeUri: ./target/aws-amplifyuibuilder-component-handler-1.0-SNAPSHOT.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.amplifyuibuilder.component.HandlerWrapper::testEntrypoint
-      Runtime: java8
+      Runtime: java11
       CodeUri: ./target/aws-amplifyuibuilder-component-handler-1.0-SNAPSHOT.jar
diff --git a/aws-amplifyuibuilder-form/.rpdk-config b/aws-amplifyuibuilder-form/.rpdk-config
index e8e6762..d2ea6e4 100644
--- a/aws-amplifyuibuilder-form/.rpdk-config
+++ b/aws-amplifyuibuilder-form/.rpdk-config
@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::AmplifyUIBuilder::Form",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java11",
     "entrypoint": "software.amazon.amplifyuibuilder.form.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.amplifyuibuilder.form.HandlerWrapper::testEntrypoint",
     "settings": {
@@ -21,7 +21,7 @@
             "amplifyuibuilder",
             "form"
         ],
-        "codegen_template_path": "default",
+        "codegen_template_path": "guided_aws",
         "protocolVersion": "2.0.0"
     },
     "logProcessorEnabled": "true",
diff --git a/aws-amplifyuibuilder-form/aws-amplifyuibuilder-form.json b/aws-amplifyuibuilder-form/aws-amplifyuibuilder-form.json
index 09297da..8277667 100644
--- a/aws-amplifyuibuilder-form/aws-amplifyuibuilder-form.json
+++ b/aws-amplifyuibuilder-form/aws-amplifyuibuilder-form.json
@@ -535,6 +535,7 @@
       "permissions": [
         "amplify:GetApp",
         "amplifyuibuilder:CreateForm",
+        "amplifyuibuilder:GetForm",
         "amplifyuibuilder:TagResource",
         "amplifyuibuilder:UntagResource"
       ]
@@ -549,6 +550,7 @@
     "update": {
       "permissions": [
         "amplify:GetApp",
+        "amplifyuibuilder:GetForm",
         "amplifyuibuilder:TagResource",
         "amplifyuibuilder:UntagResource",
         "amplifyuibuilder:UpdateForm"
diff --git a/aws-amplifyuibuilder-form/template.yml b/aws-amplifyuibuilder-form/template.yml
index 18693be..917fb30 100644
--- a/aws-amplifyuibuilder-form/template.yml
+++ b/aws-amplifyuibuilder-form/template.yml
@@ -4,7 +4,7 @@ Description: AWS SAM template for the AWS::AmplifyUIBuilder::Form resource type
 
 Globals:
   Function:
-    Timeout: 180  # docker start-up times can be long for SAM CLI
+    Timeout: 180 # docker start-up times can be long for SAM CLI
     MemorySize: 256
 
 Resources:
@@ -12,12 +12,12 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.amplifyuibuilder.form.HandlerWrapper::handleRequest
-      Runtime: java8
+      Runtime: java11
       CodeUri: ./target/aws-amplifyuibuilder-form-1.0.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.amplifyuibuilder.form.HandlerWrapper::testEntrypoint
-      Runtime: java8
+      Runtime: java11
       CodeUri: ./target/aws-amplifyuibuilder-form-1.0.jar
diff --git a/aws-amplifyuibuilder-theme/.rpdk-config b/aws-amplifyuibuilder-theme/.rpdk-config
index 707059a..d48280a 100644
--- a/aws-amplifyuibuilder-theme/.rpdk-config
+++ b/aws-amplifyuibuilder-theme/.rpdk-config
@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::AmplifyUIBuilder::Theme",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java11",
     "entrypoint": "software.amazon.amplifyuibuilder.theme.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.amplifyuibuilder.theme.HandlerWrapper::testEntrypoint",
     "settings": {
@@ -21,5 +21,6 @@
         "codegen_template_path": "guided_aws",
         "protocolVersion": "2.0.0"
     },
+    "logProcessorEnabled": "true",
     "executableEntrypoint": "software.amazon.amplifyuibuilder.theme.HandlerWrapperExecutable"
 }
diff --git a/aws-amplifyuibuilder-theme/aws-amplifyuibuilder-theme.json b/aws-amplifyuibuilder-theme/aws-amplifyuibuilder-theme.json
index ace3a61..0a0a133 100644
--- a/aws-amplifyuibuilder-theme/aws-amplifyuibuilder-theme.json
+++ b/aws-amplifyuibuilder-theme/aws-amplifyuibuilder-theme.json
@@ -99,6 +99,7 @@
       "permissions": [
         "amplify:GetApp",
         "amplifyuibuilder:CreateTheme",
+        "amplifyuibuilder:GetTheme",
         "amplifyuibuilder:TagResource"
       ]
     },
@@ -111,6 +112,7 @@
     "update": {
       "permissions": [
         "amplify:GetApp",
+        "amplifyuibuilder:GetTheme",
         "amplifyuibuilder:TagResource",
         "amplifyuibuilder:UntagResource",
         "amplifyuibuilder:UpdateTheme"
diff --git a/aws-amplifyuibuilder-theme/template.yml b/aws-amplifyuibuilder-theme/template.yml
index 205d11c..7ccf057 100644
--- a/aws-amplifyuibuilder-theme/template.yml
+++ b/aws-amplifyuibuilder-theme/template.yml
@@ -4,7 +4,7 @@ Description: AWS SAM template for the AWS::AmplifyUIBuilder::Theme resource type
 
 Globals:
   Function:
-    Timeout: 180  # docker start-up times can be long for SAM CLI
+    Timeout: 180 # docker start-up times can be long for SAM CLI
     MemorySize: 256
 
 Resources:
@@ -12,12 +12,12 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.amplifyuibuilder.theme.HandlerWrapper::handleRequest
-      Runtime: java8
+      Runtime: java11
       CodeUri: ./target/aws-amplifyuibuilder-theme-handler-1.0-SNAPSHOT.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
       Handler: software.amazon.amplifyuibuilder.theme.HandlerWrapper::testEntrypoint
-      Runtime: java8
+      Runtime: java11
       CodeUri: ./target/aws-amplifyuibuilder-theme-handler-1.0-SNAPSHOT.jar