diff --git a/haproxy/Makefile b/haproxy/Makefile
index c7b91c8..534ac39 100644
--- a/haproxy/Makefile
+++ b/haproxy/Makefile
@@ -20,7 +20,7 @@ MAKEARGS = DEBUG="-DDEBUG_STRICT -DDEBUG_MEMORY_POOLS" \
            IGNOREGIT=true \
            LDFLAGS="-Wl,-rpath,/opt/quictls/lib" \
            TARGET="linux-glibc" \
-           EXTRAVERSION="+mangadex/$(BUILD_VERSION_REPOSHA)" \
+           EXTRAVERSION="+mangadex-$(BUILD_VERSION_REPOSHA)" \
            VERDATE="$(shell date -u -I'minutes')" \
            USE_DL=1 \
            USE_GETADDRINFO=1 \
@@ -74,6 +74,8 @@ $(HAPROXY_DEBORIG): $(HAPROXY_TARBALL)
 build-deb: $(HAPROXY_DEBORIG) $(HAPROXY_BUILDIR)
 	cp -rf debian $(HAPROXY_BUILDIR)/
 	cd $(HAPROXY_BUILDIR) && debuild -us -uc
+	rm -fv $(HAPROXY_TARBALL)
+	rm -rf $(HAPROXY_BUILDIR)
 
 clean:
 	rm -fv "$(HAPROXY_TARBALL)"
diff --git a/haproxy/debian/rules b/haproxy/debian/rules
index 7cecbb7..37f40d8 100755
--- a/haproxy/debian/rules
+++ b/haproxy/debian/rules
@@ -11,7 +11,7 @@ MAKEARGS = DEBUG="-DDEBUG_STRICT -DDEBUG_MEMORY_POOLS" \
            IGNOREGIT=true \
            LDFLAGS="-Wl,-rpath,/opt/quictls/lib" \
            TARGET="linux-glibc" \
-           EXTRAVERSION="+mangadex/$(BUILD_VERSION_REPOSHA)" \
+           EXTRAVERSION="+mangadex-$(BUILD_VERSION_REPOSHA)" \
            VERDATE="$(shell date -u -I'minutes')" \
            USE_DL=1 \
            USE_GETADDRINFO=1 \