diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1a86f95..fd64552 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -25,7 +25,7 @@ jobs:
   test-stack:
     strategy:
       matrix:
-        stack: [heroku-18, heroku-20, heroku-22]
+        stack: [heroku-20, heroku-22]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
diff --git a/Changelog.md b/Changelog.md
index 5e75cf1..27a6bb2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 * Converted our remaining CircleCI tests to Github Actions
 * Add validation for PGBOUNCER_URLS
 * Add stack tests
+* Remove support for Heroku-18
 
 ## v0.13.0 (September 9, 2022)
 * Update pgbouncer to v1.17.0 for Heroku-18 and Heroku-20 (for parity with Heroku-22)
diff --git a/Makefile b/Makefile
index 815108f..b445f2e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,4 @@
-build: build-heroku-18 build-heroku-20 build-heroku-22
-
-build-heroku-18:
-	@echo "Building pgbouncer in Docker for heroku-18..."
-	@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-18" -w /buildpack heroku/heroku:18-build support/pgbouncer-build
+build: build-heroku-20 build-heroku-22
 
 build-heroku-20:
 	@echo "Building pgbouncer in Docker for heroku-20..."
diff --git a/README.md b/README.md
index 15bfe6d..8039acb 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,6 @@ that process.
 
 ## PgBouncer Version
 
-- Heroku-18: `v1.17.0`
 - Heroku-20: `v1.17.0`
 - Heroku-22: `v1.17.0`
 
diff --git a/pgbouncer-heroku-18.tgz b/pgbouncer-heroku-18.tgz
deleted file mode 100644
index 95f1e1c..0000000
Binary files a/pgbouncer-heroku-18.tgz and /dev/null differ