diff --git a/.github/workflows/maestro.yml b/.github/workflows/maestro.yml
index 389feb0665..0349e373bb 100644
--- a/.github/workflows/maestro.yml
+++ b/.github/workflows/maestro.yml
@@ -36,6 +36,8 @@ jobs:
           java-version: '17'
       - name: Assemble debug APK
         run: ./gradlew assembleDebug $CI_GRADLE_ARG_PROPERTIES
+        env:
+          ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
       - name: Upload debug APKs
         uses: actions/upload-artifact@v3
         with:
diff --git a/.maestro/tests/roomList/timeline/messages/location.yaml b/.maestro/tests/roomList/timeline/messages/location.yaml
new file mode 100644
index 0000000000..73dca6eeb4
--- /dev/null
+++ b/.maestro/tests/roomList/timeline/messages/location.yaml
@@ -0,0 +1,7 @@
+appId: ${APP_ID}
+---
+- takeScreenshot: build/maestro/520-Timeline
+- tapOn: "Add attachment"
+- tapOn: "Location"
+- tapOn: "Share my location"
+- takeScreenshot: build/maestro/521-Timeline
diff --git a/.maestro/tests/roomList/timeline/messages/text.yaml b/.maestro/tests/roomList/timeline/messages/text.yaml
new file mode 100644
index 0000000000..4e3b7bbd45
--- /dev/null
+++ b/.maestro/tests/roomList/timeline/messages/text.yaml
@@ -0,0 +1,8 @@
+appId: ${APP_ID}
+---
+- takeScreenshot: build/maestro/510-Timeline
+- tapOn: "Message"
+- inputText: "Hello world!"
+- tapOn: "Send"
+- hideKeyboard
+- takeScreenshot: build/maestro/511-Timeline
diff --git a/.maestro/tests/roomList/timeline/timeline.yaml b/.maestro/tests/roomList/timeline/timeline.yaml
index e17bcb35cf..bec566985d 100644
--- a/.maestro/tests/roomList/timeline/timeline.yaml
+++ b/.maestro/tests/roomList/timeline/timeline.yaml
@@ -1,12 +1,9 @@
 appId: ${APP_ID}
 ---
 # This is the name of one room
-# TODO Create a room on a new account
 - tapOn: ${ROOM_NAME}
 - takeScreenshot: build/maestro/500-Timeline
-- tapOn: "Message"
-- inputText: "Hello world!"
-- tapOn: "Send"
-- hideKeyboard
+- runFlow: messages/text.yaml
+- runFlow: messages/location.yaml
 - back
 - runFlow: ../../assertions/assertHomeDisplayed.yaml