diff --git a/Makefile b/Makefile
index fc9e6ae..465d122 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,14 @@
 BUILD_DIR = build
 TARGET_DIR ?= target
 
-.PHONY: all clean test krill
+.PHONY: all clean test krill index
 
 .PRECIOUS: %.zip %.tree_tagger.zip %.ud.zip %.spacy.zip %.i5.xml %.tar
 
 all: $(TARGET_DIR)/dnb.i5.xml
 
 krill: $(TARGET_DIR)/dnb.krill.tar
+index: $(TARGET_DIR)/dnb.index.tar.xz
 
 KORAPXML2CONLLU ?= java -jar lib/korapxml2conllu.jar
 
@@ -53,10 +54,7 @@
 
 %.index: %.json
 	rm -rf $@
-	mkdir -p $@
-	chmod a+rwX $@
-	docker run  --rm -v ./$(TARGET_DIR):/data:z korap/kustvakt:latest-full Krill-Indexer.jar -c /kustvakt/kustvakt.conf -i /data/dnb.json -o /data/dnb.index/
-	chmod o-w $@
+	java -jar lib/Krill-Indexer.jar -c lib/krill.conf -i $< -o $@
 
 %.index.tar.xz: %.index
 	tar -I 'xz -T0' -C $(dir $<) -cf $@ $(notdir $<)
diff --git a/lib/Krill-Indexer.jar b/lib/Krill-Indexer.jar
new file mode 100644
index 0000000..6d1a3c1
--- /dev/null
+++ b/lib/Krill-Indexer.jar
Binary files differ
diff --git a/lib/krill.conf b/lib/krill.conf
new file mode 100644
index 0000000..3e1cf73
--- /dev/null
+++ b/lib/krill.conf
@@ -0,0 +1,7 @@
+#Krill
+krill.index.commit.count = 134217000
+krill.index.commit.log = log/krill.commit.log
+krill.index.commit.auto = 500
+krill.index.relations.max = 100
+# Directory path of virtual corpora to cache
+#krill.namedVC = vc