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 c9bf018..75409bf 100644
--- a/schedule.md
+++ b/schedule.md
@@ -21,6 +21,6 @@
 |  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)                    |
+|  9:30 PST / 18:30 CET | [Overview of Gerrit in AWS](sessions/overview-of-gerrit-in-aws.md)                      |
 | 10:00 PST / 19:00 CET | Q&A with the maintainers (may include 1-2 polls)                                        |
 | 11:00 PDT / 20:00 CET | End of Day 2                                                                            |
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