diff --git a/Dockerfile.arch b/Dockerfile.arch
index bb5d41e8..d9d29226 100644
--- a/Dockerfile.arch
+++ b/Dockerfile.arch
@@ -59,8 +59,12 @@ USER root
 
 RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst
 
+# Create symlink for libexpect - Arch puts it in versioned subdirectory
+# which causes configure to fail with "libexpect not found"
+RUN ln -sf /usr/lib/expect5.45.4/libexpect5.45.4.so /usr/lib/libexpect.so
+
 WORKDIR /usr/src
-RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
+RUN git clone https://git.jabber.space/devs/stabber
 
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh
diff --git a/Dockerfile.debian b/Dockerfile.debian
index b2055712..01f6d9ed 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -39,8 +39,8 @@ 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 -c http.sslverify=false https://git.jabber.space/devs/stabber
-RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
+RUN git clone https://git.jabber.space/devs/stabber
+RUN git clone https://github.com/strophe/libstrophe
 
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 91845616..87659d43 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -47,7 +47,7 @@ ENV TERM=xterm
 RUN mkdir -p /usr/src
 WORKDIR /usr/src
 
-RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
+RUN git clone https://git.jabber.space/devs/stabber
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr --disable-dependency-tracking
@@ -56,7 +56,7 @@ RUN make install
 
 WORKDIR /usr/src
 RUN mkdir -p /usr/src/libstrophe
-RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
+RUN git clone https://github.com/strophe/libstrophe
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
diff --git a/Dockerfile.tumbleweed b/Dockerfile.tumbleweed
index 3e7683e0..1f3bd3f1 100644
--- a/Dockerfile.tumbleweed
+++ b/Dockerfile.tumbleweed
@@ -46,7 +46,7 @@ ENV TERM=xterm
 RUN mkdir -p /usr/src
 WORKDIR /usr/src
 
-RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
+RUN git clone https://git.jabber.space/devs/stabber
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr --disable-dependency-tracking
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 4b15c1e8..fceded48 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -38,8 +38,8 @@ 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 -c http.sslverify=false https://git.jabber.space/devs/stabber
-RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
+RUN git clone https://git.jabber.space/devs/stabber
+RUN git clone https://github.com/strophe/libstrophe
 
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh