diff --git a/.changeset/lazy-plants-poke.md b/.changeset/lazy-plants-poke.md
new file mode 100644
index 000000000..f4254d282
--- /dev/null
+++ b/.changeset/lazy-plants-poke.md
@@ -0,0 +1,5 @@
+---
+'apollo-angular': major
+---
+
+Drop support for Angular 17
diff --git a/.changeset/yellow-points-sort.md b/.changeset/yellow-points-sort.md
new file mode 100644
index 000000000..deeaaeb77
--- /dev/null
+++ b/.changeset/yellow-points-sort.md
@@ -0,0 +1,5 @@
+---
+'apollo-angular': major
+---
+
+Support Angular 20
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 51b95bf13..eb7f3ccb4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -115,9 +115,24 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        angular_version: [17, 18, 19]
+        angular_version: [18, 19, 20]
         graphql_version: [15, 16]
-        node_version: [18, 20]
+        node_version: [18, 20, 22, 24]
+        exclude:
+          - angular_version: 18
+            node_version: 22
+
+          - angular_version: 18
+            node_version: 24
+
+          - angular_version: 19
+            node_version: 22
+
+          - angular_version: 19
+            node_version: 24
+
+          - angular_version: 20
+            node_version: 18
     steps:
       - name: Use Node.js ${{ matrix.node_version }}
         uses: actions/setup-node@master
diff --git a/packages/apollo-angular/package.json b/packages/apollo-angular/package.json
index fecb00609..3acd144fd 100644
--- a/packages/apollo-angular/package.json
+++ b/packages/apollo-angular/package.json
@@ -36,7 +36,7 @@
     "test:schematics": "tsc -p schematics/tsconfig.test.json && node scripts/move-schematics.js && jasmine --config=schematics/jasmine.json"
   },
   "peerDependencies": {
-    "@angular/core": "^17.0.0 || ^18.0.0 || ^19.0.0",
+    "@angular/core": "^18.0.0 || ^19.0.0 || ^20.0.0",
     "@apollo/client": "^3.13.1",
     "graphql": "^15.0.0 || ^16.0.0",
     "rxjs": "^6.0.0 || ^7.0.0"
diff --git a/scripts/prepare-e2e.js b/scripts/prepare-e2e.js
index f3ee2c9ff..290aefe43 100755
--- a/scripts/prepare-e2e.js
+++ b/scripts/prepare-e2e.js
@@ -7,7 +7,12 @@ const cwd = process.cwd();
 const [, , name, version] = process.argv;
 
 function updateComponent() {
-  let filepath = path.join(cwd, `./${name}/src/app/app.component.ts`);
+  let filepath =
+    [
+      path.join(cwd, `./${name}/src/app/app.component.ts`),
+      path.join(cwd, `./${name}/src/app/app.ts`),
+    ].find(path => fs.existsSync(path));
+
   const code =
     `import { Apollo } from 'apollo-angular';\n` +
     `import { versionInfo } from 'graphql';\n` +