diff --git a/Makefile b/Makefile
index 6637b46..bb4ec13 100644
--- a/Makefile
+++ b/Makefile
@@ -84,11 +84,13 @@
 	printf "%s\t%s\n" "$$(grep -c '<idsText ' $<)" "$$(unzip -l $@ | grep data.xml | wc -l)"
 
 %.tree_tagger.zip: %.zip
-	$(KORAPXMLTOOL) -A "docker run -v ./models/:/local/models--rm -i korap/conllu-treetagger -l german -p" -t zip -f -D $(TARGET_DIR) $<
-#	 $(KORAPXMLTOOL) $< | pv | docker run --rm -i korap/conllu2treetagger -l german | conllu2korapxml > $@
+	$(KORAPXMLTOOL) -T treetagger -t zip -f -D $(TARGET_DIR) $<
 
-%.spacy.zip: %.zip
-	$(SPACYXMLTOOL) -A "docker run -e SPACY_USE_DEPENDENCIES=True --rm -i korap/conllu2spacy:latest" -t zip -f -D $(TARGET_DIR) $<
+%.gender.zip: %.zip bin/conllu-gender
+	$(KORAPXMLTOOL) -j 1 -A "bin/conllu-gender -s" -l WARNING -F gender -t zip --force -D $(TARGET_DIR) $<
+
+%.spacy.zip: %.zip | bin/korapxmltool
+	$(KORAPXMLTOOL) -P spacy -t zip --force -D $(TARGET_DIR) $<
 
 models/de.marmot:
 	mkdir -p models