diff --git a/Dockerfile.debian b/Dockerfile.debian
index 114aec28..5b4c1823 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -5,6 +5,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   autoconf \
   autoconf-archive \
   automake \
+  ca-certificates \
   expect \
   gcc \
   git \
@@ -36,7 +37,7 @@ 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://github.com/strophe/libstrophe
+RUN git clone --depth 1 https://git.jabber.space/devs/libstrophe-gh.git libstrophe
 
 #WORKDIR /usr/src/stabber
 #RUN ./bootstrap.sh
@@ -47,7 +48,7 @@ RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
-RUN make
+RUN make -j$(nproc)
 RUN make install
 
 WORKDIR /usr/src/profanity
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index c8004c11..3838cde2 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -9,6 +9,7 @@ RUN dnf install -y \
   autoconf-archive \
   automake \
   awk \
+  ca-certificates \
   expect-devel \
   gcc \
   git \
@@ -56,11 +57,11 @@ WORKDIR /usr/src
 
 WORKDIR /usr/src
 RUN mkdir -p /usr/src/libstrophe
-RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
+RUN git clone --depth 1 https://git.jabber.space/devs/libstrophe-gh.git libstrophe
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
-RUN make
+RUN make -j$(nproc)
 RUN make install
 
 RUN mkdir -p /usr/src/profanity
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 7f100ddd..5c353194 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   autoconf \
   autoconf-archive \
   automake \
+  ca-certificates \
   expect \
   gcc \
   git \
@@ -37,7 +38,7 @@ 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://github.com/strophe/libstrophe
+RUN git clone --depth 1 https://git.jabber.space/devs/libstrophe-gh.git libstrophe
 
 # TODO: Re-enable once libmicrohttpd-dev has been updated.
 #WORKDIR /usr/src/stabber
@@ -49,7 +50,7 @@ RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
-RUN make
+RUN make -j$(nproc)
 RUN make install
 
 WORKDIR /usr/src/profanity
diff --git a/ci-build.sh b/ci-build.sh
index 82ff76ff..43f01fe5 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -121,11 +121,11 @@ esac
 case "$ARCH" in
     linux*)
          echo
-         echo "--> Building with ./configure ${tests[0]} --enable-valgrind $*"
+         echo "--> Building with ./configure -C ${tests[0]} --enable-valgrind $*"
          echo
 
          # shellcheck disable=SC2086
-        ./configure ${tests[0]} --enable-valgrind $*
+        ./configure -C ${tests[0]} --enable-valgrind $*
 
         $MAKE CC="${CC}"
         if grep '^ID=' /etc/os-release | grep -q -e debian; then
@@ -140,11 +140,11 @@ esac
 for features in "${tests[@]}"
 do
     echo
-    echo "--> Building with ./configure ${features} $*"
+    echo "--> Building with ./configure -C ${features} $*"
     echo
 
     # shellcheck disable=SC2086
-    ./configure $features $*
+    ./configure -C $features $*
 
     $MAKE CC="${CC}"
     $MAKE check