diff --git a/Dockerfile.arch b/Dockerfile.arch
index 94244ab0..da3d77bf 100644
--- a/Dockerfile.arch
+++ b/Dockerfile.arch
@@ -1,7 +1,11 @@
 FROM archlinux
 
+ENV TERM=xterm
+
 RUN pacman -Syu --noconfirm
-RUN pacman -S --needed --noconfirm reflector && reflector --latest 20 --protocol https --sort rate --save /etc/pacman.d/mirrorlist 
+# reflector is optional - if it fails due to network issues, continue with default mirrorlist
+RUN pacman -S --needed --noconfirm reflector && \
+    (reflector --latest 20 --protocol https --sort rate --save /etc/pacman.d/mirrorlist || true)
 RUN pacman-key --init
 RUN pacman -S --needed --noconfirm \
   autoconf \
@@ -57,13 +61,13 @@ USER root
 RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst
 
 WORKDIR /usr/src
-#RUN git clone https://github.com/boothj5/stabber
+RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
 
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
+WORKDIR /usr/src/stabber
+RUN ./bootstrap.sh
+RUN ./configure --prefix=/usr --disable-dependency-tracking
+RUN make
+RUN make install
 
 WORKDIR /usr/src/profanity
 COPY . /usr/src/profanity
diff --git a/Dockerfile.debian b/Dockerfile.debian
index 114aec28..a80f2d2b 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -1,11 +1,13 @@
 # Build the latest Debian testing image
 FROM debian:testing
 
+ENV DEBIAN_FRONTEND="noninteractive"
+ENV TERM=xterm
+
 RUN apt-get update && apt-get install -y --no-install-recommends \
   autoconf \
   autoconf-archive \
   automake \
-  expect \
   gcc \
   git \
   libcmocka-dev \
@@ -35,14 +37,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src
 
-#RUN git clone https://github.com/boothj5/stabber
+RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
 RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
+WORKDIR /usr/src/stabber
+RUN ./bootstrap.sh
+RUN ./configure --prefix=/usr --disable-dependency-tracking
+RUN make
+RUN make install
 
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index c8004c11..412e0a4f 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -1,7 +1,6 @@
 # Build the latest Fedora image
 FROM fedora:latest
 
-# expect - for functional tests
 # libmicrohttpd - for stabber
 # glibc-locale - to have en_US locale
 RUN dnf install -y \
@@ -9,7 +8,6 @@ RUN dnf install -y \
   autoconf-archive \
   automake \
   awk \
-  expect-devel \
   gcc \
   git \
   glib2-devel \
@@ -42,17 +40,17 @@ RUN dnf install -y \
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
+ENV TERM=xterm
 
 RUN mkdir -p /usr/src
 WORKDIR /usr/src
 
-#RUN mkdir -p /usr/src/stabber
-#RUN git clone https://github.com/boothj5/stabber
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
+RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
+WORKDIR /usr/src/stabber
+RUN ./bootstrap.sh
+RUN ./configure --prefix=/usr --disable-dependency-tracking
+RUN make
+RUN make install
 
 WORKDIR /usr/src
 RUN mkdir -p /usr/src/libstrophe
diff --git a/Dockerfile.tumbleweed b/Dockerfile.tumbleweed
index 1777d170..b8354229 100644
--- a/Dockerfile.tumbleweed
+++ b/Dockerfile.tumbleweed
@@ -1,14 +1,12 @@
 # Build the latest openSUSE Tumbleweed image
 FROM opensuse/tumbleweed
 
-# expect - for functional tests
 # libmicrohttpd - for stabber
 # glibc-locale - to have en_US locale
 RUN zypper --non-interactive in --no-recommends \
   autoconf \
   autoconf-archive \
   automake \
-  expect-devel \
   gcc \
   git \
   glib2-devel \
@@ -41,17 +39,17 @@ RUN zypper --non-interactive in --no-recommends \
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
+ENV TERM=xterm
 
 RUN mkdir -p /usr/src
 WORKDIR /usr/src
 
-#RUN mkdir -p /usr/src/stabber
-#RUN git clone git://github.com/boothj5/stabber.git
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
+RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
+WORKDIR /usr/src/stabber
+RUN ./bootstrap.sh
+RUN ./configure --prefix=/usr --disable-dependency-tracking
+RUN make
+RUN make install
 
 RUN mkdir -p /usr/src/profanity
 WORKDIR /usr/src/profanity
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 7f100ddd..edc2cdd6 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,12 +1,12 @@
 FROM ubuntu:latest
 
 ENV DEBIAN_FRONTEND="noninteractive"
+ENV TERM=xterm
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   autoconf \
   autoconf-archive \
   automake \
-  expect \
   gcc \
   git \
   libcmocka-dev \
@@ -36,15 +36,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src
 
-#RUN git clone https://github.com/boothj5/stabber
+RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
 RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 
-# TODO: Re-enable once libmicrohttpd-dev has been updated.
-#WORKDIR /usr/src/stabber
-#RUN ./bootstrap.sh
-#RUN ./configure --prefix=/usr --disable-dependency-tracking
-#RUN make
-#RUN make install
+WORKDIR /usr/src/stabber
+RUN ./bootstrap.sh
+RUN ./configure --prefix=/usr --disable-dependency-tracking
+RUN make
+RUN make install
 
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh