diff --git a/scripts/install-essentials b/scripts/install-essentials
index 6c1bbe4..d855a32 100755
--- a/scripts/install-essentials
+++ b/scripts/install-essentials
@@ -22,7 +22,7 @@ then
             logrotate python-docutils pkg-config cmake nodejs \
             libkrb5-dev postgresql-client mysql-client unzip \
             libsqlite3-dev libpq-dev libpng-dev libjpeg-dev libzstd-dev \
-            libre2-dev gettext rsync git-core
+            libre2-dev libevent-dev gettext rsync git-core
 else
     apt-get install -y \
             curl wget build-essential apt-utils locales openssh-client \
@@ -32,7 +32,7 @@ else
             logrotate python-docutils pkg-config cmake \
             libkrb5-dev postgresql-client unzip \
             libsqlite3-dev libpq-dev libpng-dev libjpeg-dev libzstd-dev \
-            libre2-dev gettext rsync git-core
+            libre2-dev libevent-dev gettext rsync git-core
 fi
 
 # Set UTF-8
diff --git a/scripts/install-pgbouncer b/scripts/install-pgbouncer
index be00920..9c7c35f 100755
--- a/scripts/install-pgbouncer
+++ b/scripts/install-pgbouncer
@@ -1,19 +1,18 @@
 #!/bin/bash
 
+set -xeuo pipefail
+
 PGBOUNCER_VERSION=${1}
 PGBOUNCER_DOWNLOAD_SHA256=${2}
-
 PGBOUNCER_DOWNLOAD_URL="https://pgbouncer.github.io/downloads/files/$PGBOUNCER_VERSION/pgbouncer-$PGBOUNCER_VERSION.tar.gz"
 
-curl -o pgbouncer.tar.gz -fsSL $PGBOUNCER_DOWNLOAD_URL
-echo "${PGBOUNCER_DOWNLOAD_SHA256} pgbouncer.tar.gz" | sha256sum -c -
-
-tar xfz pgbouncer.tar.gz
-rm -f pgbouncer.tar.gz
-cd pgbouncer-${PGBOUNCER_VERSION}
-./configure --prefix=/usr/local
-make
-cp pgbouncer /usr/local/bin
-
-cd ..
-rm -rf pgbouncer-${PGBOUNCER_VERSION}
+curl -o pgbouncer.tar.gz -fsSL $PGBOUNCER_DOWNLOAD_URL \
+    && echo "${PGBOUNCER_DOWNLOAD_SHA256} pgbouncer.tar.gz" | sha256sum -c - \
+    && tar xfz pgbouncer.tar.gz \
+    && rm -f pgbouncer.tar.gz \
+    && cd pgbouncer-${PGBOUNCER_VERSION} \
+    && ./configure --prefix=/usr/local \
+    && make \
+    && cp pgbouncer /usr/local/bin \
+    && cd .. \
+    && rm -rf pgbouncer-${PGBOUNCER_VERSION}