diff --git a/docker-compose/docker-compose-template-dev.yml b/docker-compose/docker-compose-template-dev.yml
index 963cef5..c3c8743 100644
--- a/docker-compose/docker-compose-template-dev.yml
+++ b/docker-compose/docker-compose-template-dev.yml
@@ -394,8 +394,8 @@ services:
     build:
       context: "${LSEXTPATH}/docker-compose/dockerfiles/migration"
       args:
-        - MYSQL_DATABASE="koha_${KOHA_INSTANCE}"
-        - MYSQL_USER="${KOHA_ADMINPASS}
-        - MYSQL_PASSWORD="${KOHA_ADMINUSER}"
+        - MYSQL_DATABASE=koha_${KOHA_INSTANCE}
+        - MYSQL_USER=${KOHA_ADMINUSER}
+        - MYSQL_PASSWORD=${KOHA_ADMINPASS}
     networks:
       - backend
\ No newline at end of file
diff --git a/migration/Makefile b/migration/Makefile
index d93bc57..d1be6c9 100644
--- a/migration/Makefile
+++ b/migration/Makefile
@@ -1,28 +1,30 @@
-all: migrate_catalogue
-
 KOHA_INSTANCE ?= name
 LIMIT ?= -1
 DATASET ?= example
-MIGRATION_DATA="/vagrant/migration/example_data"
+MIGRATION_DATA=$(shell pwd)/example_data
 ifeq ($(DATASET),full)
-    MIGRATION_DATA="/vagrant/migration/data"
+    MIGRATION_DATA=$(shell pwd)/data
 endif
 MIGRATION_RUN_CMD=sudo docker run --net=dockercompose_backend --rm -v $(shell pwd)/out:/out -v $(MIGRATION_DATA):/data dockercompose_migration bash -c
 VMARC=$(shell ls -1 $(MIGRATION_DATA)/*vmarc.*.txt | xargs basename)
 EXEMP=$(shell ls -1 $(MIGRATION_DATA)/*exemp.*.txt | xargs basename)
 MYSQL_CMD=mysql --default-character-set=utf8 -h koha_mysql -u$$MYSQL_USER -p$$MYSQL_PASSWORD $$MYSQL_DATABASE

-clear_old_output:
-	@echo "   Clearing out directory from old output data"
+
+.PHONY: all clean
+
+all: out/done.migrate_catalogue_to_koha
+
+clean:
 	@rm -f out/*
-	@echo ""

-massage_input_data: clear_old_output
+out/done.massage_input_data:
 	@echo "   Massaging and transforming input data (Bibliofil exports)"
 	@$(MIGRATION_RUN_CMD) "catmassage -outdir=/out -vmarc=/data/$(VMARC) -exemp=/data/$(EXEMP) -limit=$(LIMIT)"
 	@echo "OK Done massaging\n"
+	@touch out/done.massage_input_data

-setup_koha: massage_input_data
+out/done.setup_koha: out/done.massage_input_data
 	@echo "   Setting up Koha with branches, itemtypes and authorized values"
 	@echo "-- Populating branches"
 	@$(MIGRATION_RUN_CMD) '$(MYSQL_CMD) < /out/branches.sql'
@@ -33,8 +35,9 @@ setup_koha: massage_input_data
 	@echo "-- Truncating tables: biblio, bibliotiems and items"
 	@$(MIGRATION_RUN_CMD) '$(MYSQL_CMD) -e "SET foreign_key_checks=0;TRUNCATE TABLE biblioitems;TRUNCATE TABLE biblio;TRUNCATE TABLE items;SET foreign_key_checks=1;"'
 	@echo "OK Done setting up Koha\n"
+	@touch out/done.setup_koha

-migrate_catalogue: setup_koha
+out/done.migrate_catalogue_to_koha: out/done.setup_koha
 	@echo "   Importing catalogue with items into Koha"
 	@echo "-- Stopping Zebra indexer"
 	@sudo docker exec koha_container koha-stop-zebra $$KOHA_INSTANCE
@@ -44,4 +47,5 @@ migrate_catalogue: setup_koha
 	@sudo docker exec koha_container koha-shell -c "/usr/share/koha/bin/migration_tools/bulkmarcimport.pl -b -file /var/lib/state/catalogue.mrc -commit 1000" $(KOHA_INSTANCE)
 	@echo "-- Starting Zebra indexer"
 	@sudo docker exec koha_container koha-stop-zebra $$KOHA_INSTANCE
-	@echo "OK Done importing catalogue into Koha"
\ No newline at end of file
+	@echo "OK Done importing catalogue into Koha"
+	@touch out/done.migrate_catalogue_to_koha
\ No newline at end of file