diff --git a/deps/quictls/Makefile b/deps/quictls/Makefile
index 3b2e331..45644ac 100644
--- a/deps/quictls/Makefile
+++ b/deps/quictls/Makefile
@@ -1,6 +1,5 @@
 OPENSSL_VERSION = 1.1.1t
 BUILD_VERSION_REPOSHA = $(shell git rev-parse --short HEAD)
-QUICTLS_BUILD_VERSION = quic-mangadex-$(BUILD_VERSION_REPOSHA)
 QUICTLS_TAG = OpenSSL_$(subst .,_,$(OPENSSL_VERSION))-quic1
 
 QUICTLS_SOURCES = https://codeload.github.com/quictls/openssl/tar.gz/$(QUICTLS_TAG)
@@ -20,9 +19,8 @@ $(QUICTLS_BUILDIR): $(QUICTLS_TARBALL)
 	tar -C $(QUICTLS_BUILDIR) --strip-components=1 -xf "$(QUICTLS_TARBALL)"
 
 build: $(QUICTLS_BUILDIR)
-	cd "$(QUICTLS_BUILDIR)" &&  sed -i 's/^# define OPENSSL_VERSION_TEXT.*$\/# define OPENSSL_VERSION_TEXT "OpenSSL $(OPENSSL_VERSION)+$(QUICTLS_BUILD_VERSION) $(shell date -u +'%e %b %Y')"/g' "include/openssl/opensslv.h"
 	cd "$(QUICTLS_BUILDIR)" && CC=cc ./config --prefix="/opt/quictls" --openssldir="/opt/quictls" --libdir="lib" no-shared
-	$(MAKE) -C "$(QUICTLS_BUILDIR)" -j "$(shell nproc)" VERSION=$(OPENSSL_VERSION)+quic-mangadex-$(BUILD_VERSION_REPOSHA)
+	$(MAKE) -C "$(QUICTLS_BUILDIR)" -j "$(shell nproc)"
 	"$(QUICTLS_BUILDIR)/apps/openssl" version
 	$(MAKE) buildinfo_$(shell uname -s)
 
@@ -42,7 +40,7 @@ $(QUICTLS_DESTDIR): build
 	$(QUICTLS_DESTDIR_ABS)/opt/quictls/bin/openssl version
 
 $(QUICTLS_ARCHIVE): $(QUICTLS_DESTDIR)
-	tar -C "$(QUICTLS_DESTDIR)" -cjf "$(QUICTLS_ARCHIVE)" "opt"
+	tar -C "$(QUICTLS_DESTDIR)" --owner=root:0 --group=root:0 -czf "$(QUICTLS_ARCHIVE)" "opt"
 
 clean:
 	rm -fv "$(QUICTLS_TARBALL)"
diff --git a/haproxy/Makefile b/haproxy/Makefile
index 4eab44a..f7af02f 100644
--- a/haproxy/Makefile
+++ b/haproxy/Makefile
@@ -27,11 +27,9 @@ DEBUG_CFLAGS = -ggdb3 -gdwarf-4
 
 MAKEARGS = DEBUG="-DDEBUG_MEMORY_POOLS -DDEBUG_STRICT" \
            DEBUG_CFLAGS="$(DEBUG_CFLAGS)"\
-           DEFINE="-DMAX_SESS_STKCTR=5" \
            IGNOREGIT=true \
            ADDLIB="-Wl,-rpath,/opt/quictls/lib" \
            TARGET="linux-glibc" \
-           EXTRAVERSION="+mangadex-$(BUILD_VERSION_REPOSHA)" \
            VERDATE="$(shell date -u -I'minutes')" \
            USE_LIBCRYPT=1 \
            USE_LUA=1 \
@@ -54,7 +52,7 @@ MAKEARGS_LINUX = $(MAKEARGS) \
            		 USE_PCRE2_JIT=1 \
            		 USE_STATIC_PCRE2=1 \
 				 USE_NS=1 \
-				 USE_SYSTEMD=1 \
+				 SBINDIR=/usr/local/bin
 				 TARGET=linux-glibc
 
 MAKEARGS_DARWIN = $(MAKEARGS) \
@@ -105,7 +103,7 @@ $(HAPROXY_DESTDIR):
 	$(HAPROXY_DESTDIR_ABS)/usr/local/sbin/haproxy -vv
 
 $(HAPROXY_ARCHIVE): $(HAPROXY_DESTDIR)
-	tar -C "$(HAPROXY_DESTDIR)" -cjf "$(HAPROXY_ARCHIVE)" "usr"
+	tar -C "$(HAPROXY_DESTDIR)" --owner=root:0 --group=root:0 -czf "$(HAPROXY_ARCHIVE)" "usr"
 
 $(HAPROXY_DEBORIG): $(HAPROXY_TARBALL)
 	cp -fv "$(HAPROXY_TARBALL)" "$(HAPROXY_DEBORIG)"