diff --git a/lightning-talks/forward-gerrit-events-to-jenkins-via-aws-kinesis.md b/lightning-talks/forward-gerrit-events-to-jenkins-via-aws-kinesis.md
new file mode 100644
index 0000000..a1f3a0c
--- /dev/null
+++ b/lightning-talks/forward-gerrit-events-to-jenkins-via-aws-kinesis.md
@@ -0,0 +1,24 @@
+# One step closer to the cloud: forward Gerrit events to Jenkins via AWS Kinesis
+
+In the effort of making Gerrit more cloud-native, we cannot neglect tools
+integrating with Gerrit. Jenkins, currently, doesn't have a way to integrate
+with Gerrit via cloud-native tools.
+
+In this lightning talk, I will demo AWS Kinesis Consumer, a Jenkins plugin
+allowing the consumption of Gerrit stream events from Kinesis.
+
+## Polls
+
+> How do you integrate Jenkins with Gerrit?
+> - Gerrit Trigger plugin
+> - Gerrit Code Review Plugin
+> - Other
+
+> What are the main issue you face with your setup?
+> - integration is difficult to setup
+> - scalability issues with big Jenkins installation
+> - loosing events when Gerrit restarts
+> - loosing events when Jenkins restarts
+> - difficult to debug issues
+
+*[Fabio Ponciroli, GerritForge](../speakers.md#fponciroli)*
diff --git a/lightning-talks/xray-for-gerrit-in-aws.md b/lightning-talks/xray-for-gerrit-in-aws.md
deleted file mode 100644
index cfb57f4..0000000
--- a/lightning-talks/xray-for-gerrit-in-aws.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# XRAY for Gerrit in AWS
-
-Here at GerritForge we are doubling down
-the [efforts to bring Gerrit to the cloud]( https://gitenterprise.me/2021/01/04/2021-whats-cooking-in-gerritforge/)
-. As part of this endeavour, we have been working on the AWS-Gerrit project,
-which strives to provide a framework to seamlessly deploy and maintain gerrit
-installations in AWS.
-
-This short live demo will focus on one of our recent addition: the integration
-with [AWS X-RAY](https://aws.amazon.com/xray/). X-Ray helps to understand how
-Gerrit and related services are performing to identify and troubleshoot the root
-cause of performance issues and errors.
-
-*[Antonio Barone, GerritForge](../speakers.md#syntonyze)*
\ No newline at end of file
diff --git a/schedule.md b/schedule.md
index 4aa224f..bc0f33c 100644
--- a/schedule.md
+++ b/schedule.md
@@ -21,6 +21,7 @@
 |  8:00 PST / 17:00 CET | [How to survive with mono-repos in Gerrit](sessions/mono-repo-with-gerrit.md)           |
 |  8:30 PST / 17:30 CET | [Promoting Situational Awareness in Code Review Platforms](sessions/promoting-situational-awareness-in-code-review.md) |
 |  9:00 PST / 18:00 CET | [An introduction to the pull-replication plugin](sessions/pull-replication-plugin.md)                              |
-|  9:30 PST / 18:30 CET | [X-RAY for Gerrit in AWS](lightning-talks/xray-for-gerrit-in-aws.md)                    |
-| 10:00 PST / 19:00 CET | Q&A with the maintainers (may include 1-2 polls)                                        |
+|  9:30 PST / 18:30 CET | [Overview of Gerrit in AWS](sessions/overview-of-gerrit-in-aws.md)                      |
+| 10:00 PDT / 19:00 CET | [Forward Gerrit events to Jenkins via AWS Kinesis](lightning-talks/forward-gerrit-events-to-jenkins-via-aws-kinesis.md) |
+| 10:10 PST / 19:10 CET | Q&A with the maintainers (may include 1-2 polls)                                        |
 | 11:00 PST / 20:00 CET | End of Day 2                                                                            |
diff --git a/sessions/gerrit-3.4-3.5.md b/sessions/gerrit-3.4-3.5.md
index a04b640..9c60158 100644
--- a/sessions/gerrit-3.4-3.5.md
+++ b/sessions/gerrit-3.4-3.5.md
@@ -12,6 +12,14 @@
 - Performance improvements
 - Requests deadlines and cancellations
 
+Milutin gives an quick overview of latest UI improvements:
+ - Improved Comments Tab
+ - Comments Summary
+ - Ported Comments
+ - New Change metadata
+ - A11y improvements
+ - Performance improvements
+
 # Polls
 
 > ## What version are you currently running in production?
@@ -34,3 +42,4 @@
 > - Breaking changes
 
 *[Luca Milanesio, GerritForge, Gerrit Maintainer - Release Manager - Member of the ESC](../speakers.md#lmilanesio)*
+*[Milutin Kristofic, Google](../speakers.md#milutin)*
diff --git a/sessions/overview-of-gerrit-in-aws.md b/sessions/overview-of-gerrit-in-aws.md
new file mode 100644
index 0000000..5df74d4
--- /dev/null
+++ b/sessions/overview-of-gerrit-in-aws.md
@@ -0,0 +1,13 @@
+# Overview of Gerrit in AWS
+
+Here at GerritForge we are doubling down
+the [efforts to bring Gerrit to the cloud]( https://gitenterprise.me/2021/01/04/2021-whats-cooking-in-gerritforge/)
+. As part of this endeavour, we have been working on the AWS-Gerrit project,
+which strives to provide a framework to seamlessly deploy and maintain gerrit
+installations in AWS.
+
+This talk will give an overview of what AWS-Gerrit actually is, motivate its
+usage and provide an overview of its current status. In the second part, we will
+showcase and live demo some of AWS-Gerrit main features.
+
+*[Antonio Barone, GerritForge](../speakers.md#syntonyze)*
\ No newline at end of file
diff --git a/speakers.md b/speakers.md
index a4bcf52..dab4a97 100644
--- a/speakers.md
+++ b/speakers.md
@@ -132,3 +132,9 @@
 contributing changes. So far he's explored the replication plugin, 2.16
 and earlier schema migrations, plugin provided change query attributes,
 JGit, and offline reindexing.
+
+### Milutin Kristofic - Google {#milutin}
+
+Milutin joined the Gerrit frontend team in June 2019 and has been a maintainer
+since December 2020. Milutin was mostly working on better A11y and optimizing
+performance.
\ No newline at end of file