diff --git a/bun.lock b/bun.lock
index 421e005..127c856 100644
--- a/bun.lock
+++ b/bun.lock
@@ -6,7 +6,7 @@
       "name": "github-event-listener",
       "dependencies": {
         "@octokit/webhooks": "14.2.0",
-        "amqplib": "1.0.7",
+        "amqplib": "2.0.1",
         "cloudevents": "10.0.0",
         "zod": "4.4.3",
       },
@@ -100,7 +100,7 @@
 
     "ajv-formats": ["ajv-formats@2.1.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="],
 
-    "amqplib": ["amqplib@1.0.7", "", { "dependencies": { "buffer-more-ints": "~1.0.0" } }, "sha512-Z2hsSfPS0YuoRYsuVCkj/PRdh9gkdEWgyuVR0F2IVdhTwM/jdRX6aPpGnQ3vTXGhsUZO2uWVAF/+GfCazXYXIg=="],
+    "amqplib": ["amqplib@2.0.1", "", {}, "sha512-a3P2MgfCf9nzVis12VxWEn0dS6hcqve7dlEAhXDtIWR27BlhtMkILOc+H9aeHjDi6i6r94dYKc2Kx2OFe3avvg=="],
 
     "available-typed-arrays": ["available-typed-arrays@1.0.7", "", { "dependencies": { "possible-typed-array-names": "^1.0.0" } }, "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ=="],
 
@@ -110,8 +110,6 @@
 
     "brace-expansion": ["brace-expansion@5.0.3", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA=="],
 
-    "buffer-more-ints": ["buffer-more-ints@1.0.0", "", {}, "sha512-EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg=="],
-
     "bun-types": ["bun-types@1.3.9", "", { "dependencies": { "@types/node": "*" } }, "sha512-+UBWWOakIP4Tswh0Bt0QD0alpTY8cb5hvgiYeWCMet9YukHbzuruIEeXC2D7nMJPB12kbh8C7XJykSexEqGKJg=="],
 
     "call-bind": ["call-bind@1.0.8", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", "get-intrinsic": "^1.2.4", "set-function-length": "^1.2.2" } }, "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww=="],
diff --git a/package.json b/package.json
index 470cd8c..23d2725 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@octokit/webhooks": "14.2.0",
-    "amqplib": "1.0.7",
+    "amqplib": "2.0.1",
     "cloudevents": "10.0.0",
     "zod": "4.4.3"
   },
diff --git a/src/amqp/connection.ts b/src/amqp/connection.ts
index 43cd312..4854106 100644
--- a/src/amqp/connection.ts
+++ b/src/amqp/connection.ts
@@ -16,7 +16,9 @@ export interface AMQPConnection {
 export async function createAMQPConnection(config: AMQPConfig): Promise<AMQPConnection> {
   let closing = false
 
-  const connection = await amqplib.connect(config.url, { heartbeat: config.heartbeat })
+  const url = new URL(config.url)
+  url.searchParams.set('heartbeat', String(config.heartbeat))
+  const connection = await amqplib.connect(url.toString())
 
   connection.on('error', (err) => {
     console.error('AMQP connection error:', err.message)