diff --git a/Makefile b/Makefile
index 3222e28070bf995fa795d3fb58b1efdfe5951457..04b7aa0a7125239b80bf6c06961cf4cd4a755c8e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: format check mypy pylint isort insert-license gitlab-ci-linter i18n_extract i18n_build database database_rollback database_list pyinstaller
+.PHONY: format check mypy pylint isort insert-license gitlab-ci-linter i18n_update i18n_build database database_rollback database_list pyinstaller
 
 SHELL := /bin/bash
 
@@ -29,25 +29,25 @@ gitlab-ci-linter:
 check: format mypy pylint isort insert-license
 
 i18n_update:
-	find ./tikka -type f | grep .py$$ | xargs pygettext -v --output-dir=./tikka/locale -d application;
-	msgmerge ./tikka/locale/fr_FR/LC_MESSAGES/application.po tikka//locale/application.pot --update
-	msgmerge ./tikka/locale/en_US/LC_MESSAGES/application.po tikka//locale/application.pot --update
+	find ./tikka -type f | grep .py$$ | xargs pygettext -v --output-dir=./tikka/locales -d application;
+	msgmerge ./tikka/locales/fr_FR/LC_MESSAGES/application.po tikka/locales/application.pot --update
+	msgmerge ./tikka/locales/en_US/LC_MESSAGES/application.po tikka/locales/application.pot --update
 
 i18n_build:
-	msgfmt tikka/locale/fr_FR/LC_MESSAGES/application.po  --output-file=tikka/locale/fr_FR/LC_MESSAGES/application.mo
-	msgfmt tikka/locale/en_US/LC_MESSAGES/application.po  --output-file=tikka/locale/en_US/LC_MESSAGES/application.mo
+	msgfmt tikka/locales/fr_FR/LC_MESSAGES/application.po  --output-file=tikka/locales/fr_FR/LC_MESSAGES/application.mo
+	msgfmt tikka/locales/en_US/LC_MESSAGES/application.po  --output-file=tikka/locales/en_US/LC_MESSAGES/application.mo
 
 database:
-	yoyo apply --batch --no-config-file --database sqlite:///${HOME}/.config/tikka/g1.sqlite3 ./assets/migrations
-	yoyo apply --batch --no-config-file --database sqlite:///${HOME}/.config/tikka/g1-test.sqlite3 ./assets/migrations
+	poetry run yoyo apply --batch --no-config-file --database sqlite:///${HOME}/.config/tikka/g1.sqlite3 ./assets/migrations
+	poetry run yoyo apply --batch --no-config-file --database sqlite:///${HOME}/.config/tikka/g1-test.sqlite3 ./assets/migrations
 
 database_rollback:
-	yoyo rollback --batch --no-config-file --database sqlite:///${HOME}/.config/tikka/g1.sqlite3 ./assets/migrations
-	yoyo rollback --batch --no-config-file --database sqlite:///${HOME}/.config/tikka/g1-test.sqlite3 ./assets/migrations
+	poetry run yoyo rollback --batch --no-config-file --database sqlite:///${HOME}/.config/tikka/g1.sqlite3 ./assets/migrations
+	poetry run yoyo rollback --batch --no-config-file --database sqlite:///${HOME}/.config/tikka/g1-test.sqlite3 ./assets/migrations
 
 database_list:
-	yoyo list --no-config-file --database sqlite:///${HOME}/.config/tikka/g1.sqlite3 ./assets/migrations
-	yoyo list --no-config-file --database sqlite:///${HOME}/.config/tikka/g1-test.sqlite3 ./assets/migrations
+	poetry run yoyo list --no-config-file --database sqlite:///${HOME}/.config/tikka/g1.sqlite3 ./assets/migrations
+	poetry run yoyo list --no-config-file --database sqlite:///${HOME}/.config/tikka/g1-test.sqlite3 ./assets/migrations
 
 pyinstaller:
 	pyinstaller dist/tikka.spec