diff --git a/.cruft.json b/.cruft.json
index bc7a5c8..a1fe88d 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "git@github.com:lyz-code/cookiecutter-python-project.git",
-  "commit": "e2247dc1d557217a1c6f8b89f9355cb9be1c8238",
+  "commit": "d90d0e819e6e727489d6eade18f7d78ec5315c0f",
   "context": {
     "cookiecutter": {
       "project_name": "Drode",
diff --git a/Makefile b/Makefile
index a6f2564..5a0d8c4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 .DEFAULT_GOAL := test
 isort = pdm run isort src tests setup.py
 black = pdm run black --target-version py39 src tests
+autoimport = pdm run autoimport src tests
 
 .PHONY: install
 install:
@@ -44,9 +45,9 @@ format:
 	@echo "- Formating the code -"
 	@echo "----------------------"
 
+	$(autoimport)
 	$(isort)
 	$(black)
-	autoimport .
 
 	@echo ""
 
diff --git a/src/drode/adapters/__init__.py b/src/drode/adapters/__init__.py
index 475968f..7ba1974 100644
--- a/src/drode/adapters/__init__.py
+++ b/src/drode/adapters/__init__.py
@@ -2,5 +2,4 @@
 
 from .drone import Drone, DroneConfigurationError
 
-
 __all__ = ["Drone", "DroneConfigurationError"]
diff --git a/src/drode/adapters/aws.py b/src/drode/adapters/aws.py
index e26355c..8c16a40 100644
--- a/src/drode/adapters/aws.py
+++ b/src/drode/adapters/aws.py
@@ -8,7 +8,6 @@
 from pydantic import BaseModel  # noqa: E0611
 from pydantic import Field
 
-
 log = logging.getLogger(__name__)
 
 
diff --git a/src/drode/adapters/drone.py b/src/drode/adapters/drone.py
index af995ca..bcde8de 100644
--- a/src/drode/adapters/drone.py
+++ b/src/drode/adapters/drone.py
@@ -7,7 +7,6 @@
 
 import requests
 
-
 log = logging.getLogger(__name__)
 
 
diff --git a/src/drode/config.py b/src/drode/config.py
index 47bf656..4233441 100644
--- a/src/drode/config.py
+++ b/src/drode/config.py
@@ -10,7 +10,6 @@
 from ruamel.yaml.parser import ParserError
 from ruamel.yaml.scanner import ScannerError
 
-
 # NOTE: We can't migrate to maison or goodconf as they only support read only
 # interaction with the configuration, and we need to update it because we save the
 # state in the config file, which is not that nice.
diff --git a/src/drode/entrypoints/__init__.py b/src/drode/entrypoints/__init__.py
index cda16f9..7e2763d 100644
--- a/src/drode/entrypoints/__init__.py
+++ b/src/drode/entrypoints/__init__.py
@@ -12,7 +12,6 @@
 from ..adapters.aws import AWS
 from ..config import Config, ConfigError
 
-
 log = logging.getLogger(__name__)
 
 
diff --git a/src/drode/entrypoints/cli.py b/src/drode/entrypoints/cli.py
index d3b060c..3a6575e 100644
--- a/src/drode/entrypoints/cli.py
+++ b/src/drode/entrypoints/cli.py
@@ -15,7 +15,6 @@
 from ..version import __version__
 from . import load_aws, load_config, load_drone, load_logger
 
-
 log = logging.getLogger(__name__)
 
 
diff --git a/src/drode/services.py b/src/drode/services.py
index a88825a..5829891 100644
--- a/src/drode/services.py
+++ b/src/drode/services.py
@@ -14,7 +14,6 @@
 from .adapters.drone import DronePromoteError
 from .config import Config, ConfigError
 
-
 log = logging.getLogger(__name__)
 
 
diff --git a/src/drode/version.py b/src/drode/version.py
index 8697d14..37f386c 100644
--- a/src/drode/version.py
+++ b/src/drode/version.py
@@ -4,7 +4,6 @@
 import sys
 from textwrap import dedent
 
-
 # Do not edit this line manually, let `make bump` do it.
 __version__ = "1.3.0"
 
diff --git a/tests/conftest.py b/tests/conftest.py
index d453812..bd51673 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -10,7 +10,6 @@
 
 from .fake_adapters import FakeAWS, FakeDrone
 
-
 os.environ["DRONE_SERVER"] = "https://drone.url"
 os.environ["DRONE_TOKEN"] = "drone_token"
 
diff --git a/tests/e2e/test_cli.py b/tests/e2e/test_cli.py
index 7062ee9..59a28c9 100644
--- a/tests/e2e/test_cli.py
+++ b/tests/e2e/test_cli.py
@@ -18,7 +18,6 @@
 
 from ..factories import BuildInfoFactory
 
-
 FakeDeps = Dict[str, Any]
 
 
diff --git a/tests/fake_adapters.py b/tests/fake_adapters.py
index 0621640..1bc4e70 100644
--- a/tests/fake_adapters.py
+++ b/tests/fake_adapters.py
@@ -13,7 +13,6 @@
 
 from .factories import BuildInfoFactory
 
-
 log = logging.getLogger(__name__)