diff --git a/.github/workflows/simulator.yml b/.github/workflows/ci.yml
similarity index 82%
rename from .github/workflows/simulator.yml
rename to .github/workflows/ci.yml
index 29d34a4e1..eed88ef68 100644
--- a/.github/workflows/simulator.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Simulator
+name: CI
 
 on:
   # Triggers the workflow on any pull request and push to develop
@@ -18,6 +18,7 @@ jobs:
       - uses: actions/checkout@v2
 
       # Common cache
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
       - uses: actions/cache@v2
         with:
           path: Pods
@@ -32,6 +33,7 @@ jobs:
             ${{ runner.os }}-gems-
 
       # Common setup
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
       - name: Bundle install
         run: |
           bundle config path vendor/bundle
@@ -39,7 +41,7 @@ jobs:
       - name: Use right MatrixKit and MatrixSDK versions
         run: bundle exec fastlane point_dependencies_to_pending_releases
 
-      # Main job
+      # Main step
       - name: Build iOS simulator
         run: bundle exec fastlane build
 
@@ -52,6 +54,7 @@ jobs:
       - uses: actions/checkout@v2
 
       # Common cache
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
       - uses: actions/cache@v2
         with:
           path: Pods
@@ -66,6 +69,7 @@ jobs:
             ${{ runner.os }}-gems-
 
       # Common setup
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
       - name: Bundle install
         run: |
           bundle config path vendor/bundle
@@ -73,6 +77,6 @@ jobs:
       - name: Use right MatrixKit and MatrixSDK versions
         run: bundle exec fastlane point_dependencies_to_pending_releases
 
-      # Main job
+      # Main step
       - name: Unit tests
         run: bundle exec fastlane test
diff --git a/CHANGES.rst b/CHANGES.rst
index 15f800fb6..589cfd792 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -21,7 +21,7 @@ Changes to be released in next version
  * 
     
 🧱 Build
- * 
+ * GH Actions: Start using them for CI to check simulator build and tests.
 
 Others
  *