diff --git a/.doctrine-project.json b/.doctrine-project.json
index ca091627a..73ba9db54 100644
--- a/.doctrine-project.json
+++ b/.doctrine-project.json
@@ -10,16 +10,22 @@
       "slug": "latest",
       "upcoming": true
     },
+    {
+      "name": "2.18",
+      "branchName": "2.18.x",
+      "slug": "2.18",
+      "upcoming": true
+    },
     {
       "name": "2.17",
       "branchName": "2.17.x",
       "slug": "2.17",
-      "upcoming": true
+      "current": true
     },
     {
       "name": "2.16",
       "slug": "2.16",
-      "current": true
+      "maintained": false
     },
     {
       "name": "2.15",
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index bf03329c2..6b74226f5 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -87,7 +87,7 @@ jobs:
         with:
           php-version: "${{ matrix.php-version }}"
           coverage: "pcov"
-          ini-values: "zend.assertions=1"
+          ini-file: "development"
           extensions: "pdo_sqlite"
           tools: "flex"
 
diff --git a/.github/workflows/test-dev-stability.yml b/.github/workflows/test-dev-stability.yml
index 701cfab60..82b919db6 100644
--- a/.github/workflows/test-dev-stability.yml
+++ b/.github/workflows/test-dev-stability.yml
@@ -35,7 +35,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           php-version: "${{ matrix.php-version }}"
-          ini-values: "zend.assertions=1"
+          ini-file: "development"
           extensions: "pdo_sqlite"
           tools: "flex"
 
diff --git a/.symfony.bundle.yaml b/.symfony.bundle.yaml
index 55ec8acbd..f06cf8cb6 100644
--- a/.symfony.bundle.yaml
+++ b/.symfony.bundle.yaml
@@ -12,9 +12,10 @@ branches:
     - "2.15.x"
     - "2.16.x"
     - "2.17.x"
+    - "2.18.x"
 maintained_branches:
-    - "2.16.x"
     - "2.17.x"
+    - "2.18.x"
 doc_dir: "docs/en/"
-current_branch: "2.16.x"
-dev_branch: "2.17.x"
+current_branch: "2.17.x"
+dev_branch: "2.18.x"
diff --git a/UPGRADE-2.18.md b/UPGRADE-2.18.md
new file mode 100644
index 000000000..8d6ada070
--- /dev/null
+++ b/UPGRADE-2.18.md
@@ -0,0 +1,15 @@
+UPGRADE FROM 2.17 to 2.18
+=========================
+
+DoctrineOrmMappingsPass
+-----------------------
+
+### The `DoctrineOrmMappingsPass::createYamlMappingDriver()` method is deprecated
+
+This method is deprecated with no replacement planned and will be removed in
+DoctrineBundle 3.0.
+
+### The `DoctrineOrmMappingsPass::createAnnotationMappingDriver()` method is deprecated
+
+This method is deprecated with no replacement planned and will be removed in
+DoctrineBundle 3.0.