diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 829f613..c1c2821 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,16 +7,19 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.8', '3.12']
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: ${{ matrix.python-version }}
       - name: Upgrade pip
         run: python -m pip install --upgrade pip setuptools
       - name: Install dependencies
         run: |
           pip install .[dev]
       - name: Test lint, types, and format
-        run: make test
+        run: make test
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c82665b..26b1abb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,16 @@ instructions, because git commits are used to generate release notes:
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-18.0.0'></a>
+## v18.0.0 (2024-06-20)
+
+- 💥[Feature] Upgrade to redwood (by @dawoudsheraz)
+- [Bugfix] Make plugin compatible with Python 3.12 by removing dependency on `pkg_resources`. (by @regisb)
+- 💥[Feature] Upgrade the deprecated [edx-app-android](https://github.com/openedx-unsupported/edx-app-android) to [openedx-app-android](https://github.com/openedx/openedx-app-android). (by @hamza-56)
+- [Feature] Update the tutor.yaml configuration to align with the new app’s default settings. See the default configuration here: [default_config/prod/config.yaml](https://github.com/openedx/openedx-app-android/blob/main/default_config/prod/config.yaml) (by @cmltawt0).
+- [Feature] Enhanced `ANDROID_APP_VERSION` logic to dynamically set the version based on `OPENEDX_COMMON_VERSION`: for nightly builds, `ANDROID_APP_VERSION` is set to main. For other builds, `ANDROID_APP_VERSION` is set to the value of `OPENEDX_COMMON_VERSION`. (by @hamza-56)
+
+
 <a id='changelog-17.0.0'></a>
 ## v17.0.0 (2023-12-09)
 
diff --git a/changelog.d/20240212_115536_regis_pkg_resources.md b/changelog.d/20240212_115536_regis_pkg_resources.md
deleted file mode 100644
index 35b6d20..0000000
--- a/changelog.d/20240212_115536_regis_pkg_resources.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Bugfix] Make plugin compatible with Python 3.12 by removing dependency on `pkg_resources`. (by @regisb)
diff --git a/changelog.d/20240605_161642_hamzashafique_update_dependencies_new_repos.md b/changelog.d/20240605_161642_hamzashafique_update_dependencies_new_repos.md
deleted file mode 100644
index 781dc8a..0000000
--- a/changelog.d/20240605_161642_hamzashafique_update_dependencies_new_repos.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Feature] Upgrade the deprecated [edx-app-android](https://github.com/openedx-unsupported/edx-app-android) to [openedx-app-android](https://github.com/openedx/openedx-app-android). (by @hamza-56)
diff --git a/changelog.d/20240610_132027_cmltawt0_fix_config.md b/changelog.d/20240610_132027_cmltawt0_fix_config.md
deleted file mode 100644
index 8ab9ad9..0000000
--- a/changelog.d/20240610_132027_cmltawt0_fix_config.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Feature] Update the tutor.yaml configuration to align with the new app’s default settings. See the default configuration here: [default_config/prod/config.yaml](https://github.com/openedx/openedx-app-android/blob/main/default_config/prod/config.yaml) (by @cmltawt0).
diff --git a/changelog.d/20240610_212617_hamzashafiquehere_dynamic_android_app_version.md b/changelog.d/20240610_212617_hamzashafiquehere_dynamic_android_app_version.md
deleted file mode 100644
index d1fbc51..0000000
--- a/changelog.d/20240610_212617_hamzashafiquehere_dynamic_android_app_version.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Feature] Enhanced `ANDROID_APP_VERSION` logic to dynamically set the version based on `OPENEDX_COMMON_VERSION`: For nightly builds, `ANDROID_APP_VERSION` is set to main. For other builds, `ANDROID_APP_VERSION` is set to the value of `OPENEDX_COMMON_VERSION`. (by @hamza-56)
diff --git a/setup.py b/setup.py
index c4d97c3..cfd32cf 100644
--- a/setup.py
+++ b/setup.py
@@ -43,8 +43,8 @@ def load_about():
     packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
     python_requires=">=3.8",
-    install_requires=["tutor>=17.0.0,<18.0.0"],
-    extras_require={"dev": ["tutor[dev]>=17.0.0,<18.0.0"]},
+    install_requires=["tutor>=18.0.0,<19.0.0"],
+    extras_require={"dev": ["tutor[dev]>=18.0.0,<19.0.0"]},
     entry_points={
         "tutor.plugin.v1": [
             "android = tutorandroid.plugin"
diff --git a/tutorandroid/__about__.py b/tutorandroid/__about__.py
index a08b09c..c6a8b8e 100644
--- a/tutorandroid/__about__.py
+++ b/tutorandroid/__about__.py
@@ -1 +1 @@
-__version__ = "17.0.0"
+__version__ = "18.0.0"