diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 619db632..e4650e9c 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1 +1 @@
-1be3f1bfb671fa6d59dcd2203f23e1625194574b
+c3385b6562b83e2cfc5cf93d5eddcb38e8eba02e
diff --git a/assemblers/org.osbuild.error b/assemblers/org.osbuild.error
index 8091d690..d1bd133b 100755
--- a/assemblers/org.osbuild.error
+++ b/assemblers/org.osbuild.error
@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/assemblers/org.osbuild.noop b/assemblers/org.osbuild.noop
index 94b85dae..70a376c7 100755
--- a/assemblers/org.osbuild.noop
+++ b/assemblers/org.osbuild.noop
@@ -12,7 +12,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false
 """
diff --git a/assemblers/org.osbuild.oci-archive b/assemblers/org.osbuild.oci-archive
index de6920af..b2db43bf 100755
--- a/assemblers/org.osbuild.oci-archive
+++ b/assemblers/org.osbuild.oci-archive
@@ -30,7 +30,6 @@ import tempfile
 
 import osbuild.api
 
-
 DEFAULT_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 
diff --git a/assemblers/org.osbuild.ostree.commit b/assemblers/org.osbuild.ostree.commit
index d6f42d96..52c02d5c 100755
--- a/assemblers/org.osbuild.ostree.commit
+++ b/assemblers/org.osbuild.ostree.commit
@@ -28,7 +28,6 @@ import tempfile
 from osbuild import api
 from osbuild.util import ostree
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN", "CAP_NET_ADMIN", "CAP_SYS_PTRACE"]
 
 
diff --git a/assemblers/org.osbuild.qemu b/assemblers/org.osbuild.qemu
index a2d71ac4..e7caca73 100755
--- a/assemblers/org.osbuild.qemu
+++ b/assemblers/org.osbuild.qemu
@@ -28,12 +28,11 @@ import struct
 import subprocess
 import sys
 import tempfile
-from typing import List, BinaryIO, Optional
+from typing import BinaryIO, List, Optional
 
 import osbuild.api
 import osbuild.remoteloop as remoteloop
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["format", "filename", "ptuuid", "size"],
diff --git a/assemblers/org.osbuild.rawfs b/assemblers/org.osbuild.rawfs
index 80c223b0..c77c7cb4 100755
--- a/assemblers/org.osbuild.rawfs
+++ b/assemblers/org.osbuild.rawfs
@@ -28,7 +28,6 @@ import sys
 import osbuild.api
 import osbuild.remoteloop as remoteloop
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["filename", "root_fs_uuid", "size"],
diff --git a/assemblers/org.osbuild.tar b/assemblers/org.osbuild.tar
index b2704cef..5ed4dc9a 100755
--- a/assemblers/org.osbuild.tar
+++ b/assemblers/org.osbuild.tar
@@ -26,7 +26,6 @@ import sys
 
 import osbuild.api
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN"]
 
 
diff --git a/osbuild/__init__.py b/osbuild/__init__.py
index 6d1cf0fe..e088d416 100644
--- a/osbuild/__init__.py
+++ b/osbuild/__init__.py
@@ -10,7 +10,6 @@ independent of osbuild but used across the osbuild codebase.
 
 from .pipeline import Manifest, Pipeline, Stage
 
-
 __version__ = "67"
 
 __all__ = [
diff --git a/osbuild/__main__.py b/osbuild/__main__.py
index f5275b01..ebeea6a5 100755
--- a/osbuild/__main__.py
+++ b/osbuild/__main__.py
@@ -8,7 +8,6 @@ import sys
 
 from osbuild.main_cli import osbuild_cli as main
 
-
 if __name__ == "__main__":
     r = main()
     sys.exit(r)
diff --git a/osbuild/api.py b/osbuild/api.py
index 592ef9e4..d5f90fde 100644
--- a/osbuild/api.py
+++ b/osbuild/api.py
@@ -6,12 +6,12 @@ import json
 import os
 import sys
 import tempfile
-import traceback
 import threading
+import traceback
 from typing import Dict, Optional
-from .util.types import PathLike
-from .util import jsoncomm
 
+from .util import jsoncomm
+from .util.types import PathLike
 
 __all__ = [
     "API"
diff --git a/osbuild/buildroot.py b/osbuild/buildroot.py
index 49e148d9..507e070b 100644
--- a/osbuild/buildroot.py
+++ b/osbuild/buildroot.py
@@ -15,13 +15,11 @@ import stat
 import subprocess
 import tempfile
 import time
-
 from typing import Optional, Set
 
 from osbuild.api import BaseAPI
 from osbuild.util import linux
 
-
 __all__ = [
     "BuildRoot",
 ]
diff --git a/osbuild/devices.py b/osbuild/devices.py
index adc101e6..b48d33c0 100644
--- a/osbuild/devices.py
+++ b/osbuild/devices.py
@@ -16,8 +16,7 @@ import abc
 import hashlib
 import json
 import os
-
-from typing import Dict, Optional, Any
+from typing import Any, Dict, Optional
 
 from osbuild import host
 
diff --git a/osbuild/formats/v1.py b/osbuild/formats/v1.py
index f212f5c5..198a708f 100644
--- a/osbuild/formats/v1.py
+++ b/osbuild/formats/v1.py
@@ -7,10 +7,11 @@ the created tree into an artefact. The pipeline can have any
 number of nested build pipelines. A sources section is used
 to fetch resources.
 """
-from typing import Dict, Any
-from osbuild.meta import Index, ValidationResult
-from ..pipeline import BuildResult, Manifest, Pipeline, detect_host_runner
+from typing import Any, Dict
 
+from osbuild.meta import Index, ValidationResult
+
+from ..pipeline import BuildResult, Manifest, Pipeline, detect_host_runner
 
 VERSION = "1"
 
diff --git a/osbuild/formats/v2.py b/osbuild/formats/v2.py
index 64ffcff0..c0e07c57 100644
--- a/osbuild/formats/v2.py
+++ b/osbuild/formats/v2.py
@@ -2,13 +2,14 @@
 
 Second, and current, version of the manifest description
 """
-from typing import Dict, Any
+from typing import Any, Dict
+
 from osbuild.meta import Index, ModuleInfo, ValidationResult
+
 from ..inputs import Input
 from ..pipeline import Manifest, Pipeline, Stage, detect_host_runner
 from ..sources import Source
 
-
 VERSION = "2"
 
 
diff --git a/osbuild/host.py b/osbuild/host.py
index dd40e3d6..4857c2ac 100644
--- a/osbuild/host.py
+++ b/osbuild/host.py
@@ -48,7 +48,7 @@ import sys
 import threading
 import traceback
 from collections import OrderedDict
-from typing import Any, Dict, List, Optional, Tuple, Callable, Iterable, Union
+from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union
 
 from osbuild.util.jsoncomm import FdSet, Socket
 
diff --git a/osbuild/inputs.py b/osbuild/inputs.py
index c04f99f6..0cb12da6 100644
--- a/osbuild/inputs.py
+++ b/osbuild/inputs.py
@@ -20,11 +20,11 @@ import abc
 import hashlib
 import json
 import os
-
-from typing import Dict, Optional, Tuple, Any
+from typing import Any, Dict, Optional, Tuple
 
 from osbuild import host
 from osbuild.util.types import PathLike
+
 from .objectstore import StoreClient, StoreServer
 
 
diff --git a/osbuild/meta.py b/osbuild/meta.py
index 33fb9dec..6186416e 100644
--- a/osbuild/meta.py
+++ b/osbuild/meta.py
@@ -24,16 +24,16 @@ import ast
 import contextlib
 import copy
 import importlib.util
+import json
 import os
 import pkgutil
-import json
 import sys
 from collections import deque
-from typing import Dict, Sequence, List, Optional, Union, Set, Deque, Any, Tuple
+from typing import (Any, Deque, Dict, List, Optional, Sequence, Set, Tuple,
+                    Union)
 
 import jsonschema
 
-
 FAILED_TITLE = "JSON Schema validation failed"
 FAILED_TYPEURI = "https://osbuild.org/validation-error"
 
diff --git a/osbuild/monitor.py b/osbuild/monitor.py
index 4091cbef..93e59b73 100644
--- a/osbuild/monitor.py
+++ b/osbuild/monitor.py
@@ -13,7 +13,6 @@ import json
 import os
 import sys
 import time
-
 from typing import Dict
 
 import osbuild
diff --git a/osbuild/mounts.py b/osbuild/mounts.py
index 1ee026b3..a818950a 100644
--- a/osbuild/mounts.py
+++ b/osbuild/mounts.py
@@ -12,7 +12,6 @@ import hashlib
 import json
 import os
 import subprocess
-
 from typing import Dict, List
 
 from osbuild import host
diff --git a/osbuild/objectstore.py b/osbuild/objectstore.py
index dab5e297..7734fb53 100644
--- a/osbuild/objectstore.py
+++ b/osbuild/objectstore.py
@@ -3,13 +3,13 @@ import os
 import subprocess
 import tempfile
 import uuid
-from typing import Optional, Iterator, Set
+from typing import Iterator, Optional, Set
 
-from osbuild.util.types import PathLike
 from osbuild.util import jsoncomm, rmrf
 from osbuild.util.mnt import mount, umount
-from . import api
+from osbuild.util.types import PathLike
 
+from . import api
 
 __all__ = [
     "ObjectStore",
diff --git a/osbuild/pipeline.py b/osbuild/pipeline.py
index 5ce2fea1..97f0718c 100644
--- a/osbuild/pipeline.py
+++ b/osbuild/pipeline.py
@@ -5,18 +5,14 @@ import json
 import os
 from typing import Dict, Generator, Iterable, Iterator, List, Optional
 
+from . import buildroot, host, objectstore, remoteloop
 from .api import API
-from . import buildroot
-from . import host
-from . import objectstore
-from . import remoteloop
 from .devices import Device, DeviceManager
 from .inputs import Input, InputManager
 from .mounts import Mount, MountManager
+from .objectstore import ObjectStore
 from .sources import Source
 from .util import osrelease
-from .objectstore import ObjectStore
-
 
 DEFAULT_CAPABILITIES = {
     "CAP_AUDIT_WRITE",
diff --git a/osbuild/remoteloop.py b/osbuild/remoteloop.py
index 29eadf16..15a642d2 100644
--- a/osbuild/remoteloop.py
+++ b/osbuild/remoteloop.py
@@ -1,8 +1,8 @@
 import contextlib
 import errno
 import os
-from . import api
-from . import loop
+
+from . import api, loop
 from .util import jsoncomm
 
 __all__ = [
diff --git a/osbuild/sources.py b/osbuild/sources.py
index 6fe5f8fc..7d2c43f4 100644
--- a/osbuild/sources.py
+++ b/osbuild/sources.py
@@ -1,9 +1,9 @@
 import abc
-import contextlib
-import os
-import json
-import tempfile
 import concurrent.futures
+import contextlib
+import json
+import os
+import tempfile
 from abc import abstractmethod
 from typing import Dict, Tuple
 
diff --git a/osbuild/util/checksum.py b/osbuild/util/checksum.py
index 6350a809..29a1c327 100644
--- a/osbuild/util/checksum.py
+++ b/osbuild/util/checksum.py
@@ -7,7 +7,6 @@ import os
 
 from .types import PathLike
 
-
 # How many bytes to read in one go. Taken from coreutils/gnulib
 BLOCKSIZE = 32768
 
diff --git a/osbuild/util/ctx.py b/osbuild/util/ctx.py
index 68c8ff45..08a5e335 100644
--- a/osbuild/util/ctx.py
+++ b/osbuild/util/ctx.py
@@ -7,7 +7,6 @@ library.
 
 import contextlib
 
-
 __all__ = [
     "suppress_oserror",
 ]
diff --git a/osbuild/util/jsoncomm.py b/osbuild/util/jsoncomm.py
index aa988f31..6f892202 100644
--- a/osbuild/util/jsoncomm.py
+++ b/osbuild/util/jsoncomm.py
@@ -12,8 +12,8 @@ import errno
 import json
 import os
 import socket
-from typing import Any
-from typing import Optional
+from typing import Any, Optional
+
 from .types import PathLike
 
 
diff --git a/osbuild/util/linux.py b/osbuild/util/linux.py
index 2fc678d8..01d241bd 100644
--- a/osbuild/util/linux.py
+++ b/osbuild/util/linux.py
@@ -20,7 +20,6 @@ import os
 import platform
 import threading
 
-
 __all__ = [
     "ioctl_get_immutable",
     "ioctl_toggle_immutable",
diff --git a/osbuild/util/lorax.py b/osbuild/util/lorax.py
index 8adcd2d1..abd767cf 100644
--- a/osbuild/util/lorax.py
+++ b/osbuild/util/lorax.py
@@ -15,8 +15,7 @@ import re
 import shlex
 import shutil
 import subprocess
-
-from typing import Dict, Any
+from typing import Any, Dict
 
 import mako.template
 
diff --git a/osbuild/util/lvm2.py b/osbuild/util/lvm2.py
index a4407730..11414051 100644
--- a/osbuild/util/lvm2.py
+++ b/osbuild/util/lvm2.py
@@ -26,9 +26,8 @@ import os
 import re
 import struct
 import sys
-
 from collections import OrderedDict
-from typing import BinaryIO, Dict, Union, List
+from typing import BinaryIO, Dict, List, Union
 
 PathLike = Union[str, bytes, os.PathLike]
 
diff --git a/osbuild/util/osrelease.py b/osbuild/util/osrelease.py
index 4dc4e67c..b8d56e73 100644
--- a/osbuild/util/osrelease.py
+++ b/osbuild/util/osrelease.py
@@ -6,7 +6,6 @@ related documentation can be found in `os-release(5)`.
 
 import os
 
-
 # The default paths where os-release is located, as per os-release(5)
 DEFAULT_PATHS = [
     "/etc/os-release",
diff --git a/osbuild/util/ostree.py b/osbuild/util/ostree.py
index f361c011..70600397 100644
--- a/osbuild/util/ostree.py
+++ b/osbuild/util/ostree.py
@@ -6,8 +6,7 @@ import subprocess
 import sys
 import tempfile
 import typing
-
-from typing import List, Any
+from typing import Any, List
 
 from .types import PathLike
 
diff --git a/osbuild/util/rmrf.py b/osbuild/util/rmrf.py
index 7a1c015e..e3ee5cb3 100644
--- a/osbuild/util/rmrf.py
+++ b/osbuild/util/rmrf.py
@@ -16,7 +16,6 @@ import shutil
 
 import osbuild.util.linux as linux
 
-
 __all__ = [
     "rmtree",
 ]
diff --git a/osbuild/util/selinux.py b/osbuild/util/selinux.py
index 46c1e6a2..a69a84ce 100644
--- a/osbuild/util/selinux.py
+++ b/osbuild/util/selinux.py
@@ -3,7 +3,6 @@
 import errno
 import os
 import subprocess
-
 from typing import Dict, TextIO
 
 # Extended attribute name for SELinux labels
diff --git a/osbuild/util/term.py b/osbuild/util/term.py
index 3c31e277..ef66b06d 100644
--- a/osbuild/util/term.py
+++ b/osbuild/util/term.py
@@ -1,7 +1,6 @@
 """Wrapper module for output formatting."""
 
 import sys
-
 from typing import Dict
 
 
diff --git a/osbuild/util/udev.py b/osbuild/util/udev.py
index b72de08c..79f5b3b2 100644
--- a/osbuild/util/udev.py
+++ b/osbuild/util/udev.py
@@ -3,7 +3,6 @@
 import contextlib
 import pathlib
 
-
 # The default lock dir to use
 LOCKDIR = "/run/osbuild/locks/udev"
 
diff --git a/runners/org.osbuild.linux b/runners/org.osbuild.linux
index a023e68e..1c4ae486 100755
--- a/runners/org.osbuild.linux
+++ b/runners/org.osbuild.linux
@@ -3,7 +3,6 @@
 import subprocess
 import sys
 
-
 if __name__ == "__main__":
     r = subprocess.run(sys.argv[1:], check=False)
     sys.exit(r.returncode)
diff --git a/sources/org.osbuild.curl b/sources/org.osbuild.curl
index 4deca5e1..364df38e 100755
--- a/sources/org.osbuild.curl
+++ b/sources/org.osbuild.curl
@@ -20,11 +20,9 @@ import tempfile
 import urllib.parse
 
 from osbuild import sources
-
 from osbuild.util.checksum import verify_file
 from osbuild.util.rhsm import Subscriptions
 
-
 SCHEMA = """
 "additionalProperties": false,
 "definitions": {
diff --git a/sources/org.osbuild.inline b/sources/org.osbuild.inline
index 3ebc3864..85f0f27a 100755
--- a/sources/org.osbuild.inline
+++ b/sources/org.osbuild.inline
@@ -19,7 +19,6 @@ import sys
 from osbuild import sources
 from osbuild.util.checksum import verify_file
 
-
 SCHEMA = """
 "definitions": {
   "item": {
diff --git a/sources/org.osbuild.ostree b/sources/org.osbuild.ostree
index 60950150..2c826c27 100755
--- a/sources/org.osbuild.ostree
+++ b/sources/org.osbuild.ostree
@@ -8,13 +8,12 @@ gpg keys are provided via `gpgkeys`.
 
 
 import os
-import sys
 import subprocess
+import sys
 import uuid
-from osbuild.util.ostree import show
 
 from osbuild import sources
-
+from osbuild.util.ostree import show
 
 SCHEMA = """
 "additionalProperties": false,
diff --git a/sources/org.osbuild.skopeo b/sources/org.osbuild.skopeo
index d7227cc3..070a35f7 100755
--- a/sources/org.osbuild.skopeo
+++ b/sources/org.osbuild.skopeo
@@ -5,11 +5,11 @@ Buildhost commands used: `skopeo`.
 """
 
 import errno
-import os
-import sys
-import subprocess
-import tempfile
 import hashlib
+import os
+import subprocess
+import sys
+import tempfile
 
 from osbuild import sources
 from osbuild.util import ctx
diff --git a/stages/org.osbuild.anaconda b/stages/org.osbuild.anaconda
index adb2bd51..6744bc1e 100755
--- a/stages/org.osbuild.anaconda
+++ b/stages/org.osbuild.anaconda
@@ -12,10 +12,8 @@ configurable via the `kickstart-modules` option.
 import os
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": true,
 "required": ["kickstart-modules"],
diff --git a/stages/org.osbuild.authconfig b/stages/org.osbuild.authconfig
index e957d98b..fc7536f6 100755
--- a/stages/org.osbuild.authconfig
+++ b/stages/org.osbuild.authconfig
@@ -16,7 +16,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "description": "Configure authentication sources."
diff --git a/stages/org.osbuild.authselect b/stages/org.osbuild.authselect
index ef464711..5724dfb8 100755
--- a/stages/org.osbuild.authselect
+++ b/stages/org.osbuild.authselect
@@ -20,7 +20,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["profile"],
diff --git a/stages/org.osbuild.bootiso.mono b/stages/org.osbuild.bootiso.mono
index 034223f4..e0289f6b 100755
--- a/stages/org.osbuild.bootiso.mono
+++ b/stages/org.osbuild.bootiso.mono
@@ -30,10 +30,9 @@ import shutil
 import subprocess
 import sys
 import tempfile
-import osbuild.remoteloop as remoteloop
 
 import osbuild.api
-
+import osbuild.remoteloop as remoteloop
 
 SCHEMA_2 = """
 "options": {
diff --git a/stages/org.osbuild.buildstamp b/stages/org.osbuild.buildstamp
index 0053a5f9..ae5c5bac 100755
--- a/stages/org.osbuild.buildstamp
+++ b/stages/org.osbuild.buildstamp
@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": true,
 "required": ["arch", "product", "version", "final"],
diff --git a/stages/org.osbuild.chrony b/stages/org.osbuild.chrony
index 8590afd6..ac93cc4c 100755
--- a/stages/org.osbuild.chrony
+++ b/stages/org.osbuild.chrony
@@ -35,12 +35,11 @@ Constraints:
 """
 
 
-import sys
 import re
+import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "oneOf": [
diff --git a/stages/org.osbuild.clevis.luks-bind b/stages/org.osbuild.clevis.luks-bind
index 0a6843cb..be686c47 100755
--- a/stages/org.osbuild.clevis.luks-bind
+++ b/stages/org.osbuild.clevis.luks-bind
@@ -10,10 +10,8 @@ import os
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",
diff --git a/stages/org.osbuild.cloud-init b/stages/org.osbuild.cloud-init
index ac8aa16d..6361691c 100755
--- a/stages/org.osbuild.cloud-init
+++ b/stages/org.osbuild.cloud-init
@@ -17,12 +17,11 @@ Currently supported subset of cloud-init configuration:
 
 
 import sys
+
 import yaml
 
-
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "reporting_handlers": {
diff --git a/stages/org.osbuild.containers.storage.conf b/stages/org.osbuild.containers.storage.conf
index 85886ad4..5a6b3147 100755
--- a/stages/org.osbuild.containers.storage.conf
+++ b/stages/org.osbuild.containers.storage.conf
@@ -17,10 +17,8 @@ try:
 except ModuleNotFoundError:
     import pytoml as toml
 
-
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "storage": {
diff --git a/stages/org.osbuild.copy b/stages/org.osbuild.copy
index deaa187e..a8261b51 100755
--- a/stages/org.osbuild.copy
+++ b/stages/org.osbuild.copy
@@ -14,13 +14,11 @@ the directory itself.
 import os
 import subprocess
 import sys
-
 from typing import Dict
-from urllib.parse import urlparse, ParseResult
+from urllib.parse import ParseResult, urlparse
 
 import osbuild.api
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN"]
 
 
diff --git a/stages/org.osbuild.cron.script b/stages/org.osbuild.cron.script
index c29ba400..46ba1080 100755
--- a/stages/org.osbuild.cron.script
+++ b/stages/org.osbuild.cron.script
@@ -17,7 +17,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "options": {
   "additionalProperties": false,
diff --git a/stages/org.osbuild.crypttab b/stages/org.osbuild.crypttab
index 5c8b33cd..7a74f44c 100755
--- a/stages/org.osbuild.crypttab
+++ b/stages/org.osbuild.crypttab
@@ -18,7 +18,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["volumes"],
diff --git a/stages/org.osbuild.debug-shell b/stages/org.osbuild.debug-shell
index 935f129f..0935a885 100755
--- a/stages/org.osbuild.debug-shell
+++ b/stages/org.osbuild.debug-shell
@@ -14,7 +14,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["tty"],
diff --git a/stages/org.osbuild.discinfo b/stages/org.osbuild.discinfo
index 894eee39..5376c53b 100755
--- a/stages/org.osbuild.discinfo
+++ b/stages/org.osbuild.discinfo
@@ -6,12 +6,11 @@ This will create a `.discinfo` file with the specified parameters.
 """
 
 import os
-import time
 import sys
+import time
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": true,
 "required": ["basearch", "release"],
diff --git a/stages/org.osbuild.dnf-automatic.config b/stages/org.osbuild.dnf-automatic.config
index 1acec52a..518ed2df 100755
--- a/stages/org.osbuild.dnf-automatic.config
+++ b/stages/org.osbuild.dnf-automatic.config
@@ -11,11 +11,11 @@ a subset of options can be set:
 
 
 import sys
+
 import iniparse
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "commands": {
diff --git a/stages/org.osbuild.dnf.config b/stages/org.osbuild.dnf.config
index 88444a78..0ef28a5c 100755
--- a/stages/org.osbuild.dnf.config
+++ b/stages/org.osbuild.dnf.config
@@ -12,11 +12,11 @@ for details about the configuration options.
 
 import os
 import sys
+
 import iniparse
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "variable": {
diff --git a/stages/org.osbuild.dracut b/stages/org.osbuild.dracut
index ef4c3e7c..e98a25dc 100755
--- a/stages/org.osbuild.dracut
+++ b/stages/org.osbuild.dracut
@@ -17,7 +17,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "required": ["kernel"],
 "properties": {
diff --git a/stages/org.osbuild.dracut.conf b/stages/org.osbuild.dracut.conf
index 346542d5..90f5d8aa 100755
--- a/stages/org.osbuild.dracut.conf
+++ b/stages/org.osbuild.dracut.conf
@@ -28,7 +28,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "additionalProperties": false,
 "required": ["config", "filename"],
diff --git a/stages/org.osbuild.error b/stages/org.osbuild.error
index dd5b3f7c..22e5f8d8 100755
--- a/stages/org.osbuild.error
+++ b/stages/org.osbuild.error
@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.fdo b/stages/org.osbuild.fdo
index 35cf5050..fde6f510 100755
--- a/stages/org.osbuild.fdo
+++ b/stages/org.osbuild.fdo
@@ -7,13 +7,12 @@ This will create a '/fdo_diun_root_certs.pem' with content
 specified via the `rootcerts` input.
 """
 
-import shutil
 import os
+import shutil
 import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "inputs": {
   "type": "object",
diff --git a/stages/org.osbuild.firewall b/stages/org.osbuild.firewall
index aa5f2942..faefec7b 100755
--- a/stages/org.osbuild.firewall
+++ b/stages/org.osbuild.firewall
@@ -31,7 +31,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.first-boot b/stages/org.osbuild.first-boot
index 8922a226..4b02b626 100755
--- a/stages/org.osbuild.first-boot
+++ b/stages/org.osbuild.first-boot
@@ -21,7 +21,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["commands"],
diff --git a/stages/org.osbuild.fix-bls b/stages/org.osbuild.fix-bls
index 556e73ac..784ae2cc 100755
--- a/stages/org.osbuild.fix-bls
+++ b/stages/org.osbuild.fix-bls
@@ -24,7 +24,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.fstab b/stages/org.osbuild.fstab
index c1764ace..eb5ac2b0 100755
--- a/stages/org.osbuild.fstab
+++ b/stages/org.osbuild.fstab
@@ -17,7 +17,6 @@ import sys
 import osbuild.api
 from osbuild.util import ostree
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["filesystems"],
diff --git a/stages/org.osbuild.gcp.guest-agent.conf b/stages/org.osbuild.gcp.guest-agent.conf
index 86de71b0..91556ed7 100755
--- a/stages/org.osbuild.gcp.guest-agent.conf
+++ b/stages/org.osbuild.gcp.guest-agent.conf
@@ -18,7 +18,6 @@ import iniparse
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "Accounts": {
diff --git a/stages/org.osbuild.greenboot b/stages/org.osbuild.greenboot
index 700bda6e..eb113f24 100755
--- a/stages/org.osbuild.greenboot
+++ b/stages/org.osbuild.greenboot
@@ -10,7 +10,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["config"],
diff --git a/stages/org.osbuild.groups b/stages/org.osbuild.groups
index 273c3a43..42d41c30 100755
--- a/stages/org.osbuild.groups
+++ b/stages/org.osbuild.groups
@@ -16,7 +16,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.grub2 b/stages/org.osbuild.grub2
index 221986b7..91bea21f 100755
--- a/stages/org.osbuild.grub2
+++ b/stages/org.osbuild.grub2
@@ -82,7 +82,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "oneOf": [{
diff --git a/stages/org.osbuild.grub2.inst b/stages/org.osbuild.grub2.inst
index f387985b..087b0240 100755
--- a/stages/org.osbuild.grub2.inst
+++ b/stages/org.osbuild.grub2.inst
@@ -42,16 +42,14 @@ image and transfers control to it.
 
 
 import os
-import subprocess
 import shutil
 import struct
+import subprocess
 import sys
-
 from typing import BinaryIO, Dict
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
     "core-mkimage": {
diff --git a/stages/org.osbuild.grub2.iso b/stages/org.osbuild.grub2.iso
index c7f4edec..a0f4b15f 100755
--- a/stages/org.osbuild.grub2.iso
+++ b/stages/org.osbuild.grub2.iso
@@ -7,10 +7,10 @@ an efiboot.img.
 
 import os
 import shutil
-import sys
 import string
-import osbuild.api
+import sys
 
+import osbuild.api
 
 SCHEMA_2 = """
 "options": {
diff --git a/stages/org.osbuild.grub2.legacy b/stages/org.osbuild.grub2.legacy
index 5e2af58c..16e676ff 100755
--- a/stages/org.osbuild.grub2.legacy
+++ b/stages/org.osbuild.grub2.legacy
@@ -45,7 +45,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 
 "definitions": {
diff --git a/stages/org.osbuild.gunzip b/stages/org.osbuild.gunzip
index 531fe68e..8d8b7b4b 100755
--- a/stages/org.osbuild.gunzip
+++ b/stages/org.osbuild.gunzip
@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "inputs": {
   "type": "object",
diff --git a/stages/org.osbuild.gzip b/stages/org.osbuild.gzip
index 2fa2164a..66b1e678 100755
--- a/stages/org.osbuild.gzip
+++ b/stages/org.osbuild.gzip
@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "inputs": {
   "type": "object",
diff --git a/stages/org.osbuild.hostname b/stages/org.osbuild.hostname
index 863457d8..c97fe50e 100755
--- a/stages/org.osbuild.hostname
+++ b/stages/org.osbuild.hostname
@@ -16,7 +16,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["hostname"],
diff --git a/stages/org.osbuild.ignition b/stages/org.osbuild.ignition
index f743ebe8..27b96d79 100755
--- a/stages/org.osbuild.ignition
+++ b/stages/org.osbuild.ignition
@@ -21,7 +21,6 @@ import sys
 
 import osbuild.api
 
-
 STAGE_OPTS = """
 "properties": {
   "network": {
diff --git a/stages/org.osbuild.implantisomd5 b/stages/org.osbuild.implantisomd5
index 4c1a4f0c..e94664d2 100755
--- a/stages/org.osbuild.implantisomd5
+++ b/stages/org.osbuild.implantisomd5
@@ -12,7 +12,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["filename"],
diff --git a/stages/org.osbuild.isolinux b/stages/org.osbuild.isolinux
index 3effe65d..bda7228a 100755
--- a/stages/org.osbuild.isolinux
+++ b/stages/org.osbuild.isolinux
@@ -6,10 +6,10 @@ Create an isolinux bootloader
 
 import os
 import shutil
-import sys
 import string
-import osbuild.api
+import sys
 
+import osbuild.api
 
 SCHEMA_2 = """
 "options": {
diff --git a/stages/org.osbuild.kernel-cmdline b/stages/org.osbuild.kernel-cmdline
index 02149575..4e636181 100755
--- a/stages/org.osbuild.kernel-cmdline
+++ b/stages/org.osbuild.kernel-cmdline
@@ -14,7 +14,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.keymap b/stages/org.osbuild.keymap
index 551c237f..43eb0cca 100755
--- a/stages/org.osbuild.keymap
+++ b/stages/org.osbuild.keymap
@@ -18,13 +18,12 @@ Valid keymaps are generally found in /lib/kbd/keymaps.
 """
 
 
+import os
 import subprocess
 import sys
-import os
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["keymap"],
diff --git a/stages/org.osbuild.kickstart b/stages/org.osbuild.kickstart
index 136a1d24..0ac046a3 100755
--- a/stages/org.osbuild.kickstart
+++ b/stages/org.osbuild.kickstart
@@ -10,14 +10,12 @@ Only a very limited set of available kickstart
 commands are supported here.
 """
 
-import sys
 import os
-
+import sys
 from typing import Dict, List
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["path"],
diff --git a/stages/org.osbuild.locale b/stages/org.osbuild.locale
index 58b1bd89..bd239162 100755
--- a/stages/org.osbuild.locale
+++ b/stages/org.osbuild.locale
@@ -11,13 +11,12 @@ target system with `LANG={language}`.
 """
 
 
+import os
 import subprocess
 import sys
-import os
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["language"],
diff --git a/stages/org.osbuild.lorax-script b/stages/org.osbuild.lorax-script
index 476c4c9b..1436893e 100755
--- a/stages/org.osbuild.lorax-script
+++ b/stages/org.osbuild.lorax-script
@@ -20,10 +20,8 @@ import collections
 import os
 import sys
 
-from osbuild.util.lorax import render_template, Script
-
 import osbuild.api
-
+from osbuild.util.lorax import Script, render_template
 
 SCHEMA = """
 "additionalProperties": false,
diff --git a/stages/org.osbuild.luks2.format b/stages/org.osbuild.luks2.format
index 5e2a7cce..e770c293 100755
--- a/stages/org.osbuild.luks2.format
+++ b/stages/org.osbuild.luks2.format
@@ -17,10 +17,8 @@ import os
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "definitions": {
   "pbkdf2": {
diff --git a/stages/org.osbuild.luks2.remove-key b/stages/org.osbuild.luks2.remove-key
index d9574520..7056e9cf 100755
--- a/stages/org.osbuild.luks2.remove-key
+++ b/stages/org.osbuild.luks2.remove-key
@@ -10,10 +10,8 @@ import os
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",
diff --git a/stages/org.osbuild.lvm2.create b/stages/org.osbuild.lvm2.create
index c0646b89..8b0aa083 100755
--- a/stages/org.osbuild.lvm2.create
+++ b/stages/org.osbuild.lvm2.create
@@ -15,10 +15,8 @@ import subprocess
 import sys
 import uuid
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",
diff --git a/stages/org.osbuild.mkdir b/stages/org.osbuild.mkdir
index 391dc849..888d1e56 100755
--- a/stages/org.osbuild.mkdir
+++ b/stages/org.osbuild.mkdir
@@ -12,7 +12,6 @@ import sys
 import osbuild.api
 from osbuild.util.path import in_tree
 
-
 SCHEMA_2 = r"""
 "options": {
   "additionalProperties": false,
diff --git a/stages/org.osbuild.mkfs.btrfs b/stages/org.osbuild.mkfs.btrfs
index 1b7f54a4..dd2cc9dd 100755
--- a/stages/org.osbuild.mkfs.btrfs
+++ b/stages/org.osbuild.mkfs.btrfs
@@ -11,10 +11,8 @@ Buildhost commands used: `mkfs.btrfs`.
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",
diff --git a/stages/org.osbuild.mkfs.ext4 b/stages/org.osbuild.mkfs.ext4
index 07957a4a..6d65950f 100755
--- a/stages/org.osbuild.mkfs.ext4
+++ b/stages/org.osbuild.mkfs.ext4
@@ -11,10 +11,8 @@ Buildhost commands used: `mke2fs`.
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",
diff --git a/stages/org.osbuild.mkfs.fat b/stages/org.osbuild.mkfs.fat
index a37f4727..40a76320 100755
--- a/stages/org.osbuild.mkfs.fat
+++ b/stages/org.osbuild.mkfs.fat
@@ -15,10 +15,8 @@ Buildhost commands used: `mkfs.fat`.
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",
diff --git a/stages/org.osbuild.mkfs.xfs b/stages/org.osbuild.mkfs.xfs
index 9af0aa89..7e5681d3 100755
--- a/stages/org.osbuild.mkfs.xfs
+++ b/stages/org.osbuild.mkfs.xfs
@@ -11,10 +11,8 @@ Buildhost commands used: `mkfs.xfs`.
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",
diff --git a/stages/org.osbuild.modprobe b/stages/org.osbuild.modprobe
index 188c38de..6c62919e 100755
--- a/stages/org.osbuild.modprobe
+++ b/stages/org.osbuild.modprobe
@@ -22,7 +22,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "additionalProperties": false,
 "required": ["commands", "filename"],
diff --git a/stages/org.osbuild.nm.conf b/stages/org.osbuild.nm.conf
index 1cbfa1d4..f456f5ad 100755
--- a/stages/org.osbuild.nm.conf
+++ b/stages/org.osbuild.nm.conf
@@ -25,7 +25,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "device-list": {
diff --git a/stages/org.osbuild.nm.conn b/stages/org.osbuild.nm.conn
index bf50c311..be141c10 100755
--- a/stages/org.osbuild.nm.conn
+++ b/stages/org.osbuild.nm.conn
@@ -13,13 +13,12 @@ and here only a subset of the available options. See the schema
 for more information.
 """
 
+import configparser
 import os
 import sys
-import configparser
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "connection": {
diff --git a/stages/org.osbuild.noop b/stages/org.osbuild.noop
index e68c72da..c44e7606 100755
--- a/stages/org.osbuild.noop
+++ b/stages/org.osbuild.noop
@@ -12,7 +12,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = """
 "options": {
   "additionalProperties": true
diff --git a/stages/org.osbuild.oci-archive b/stages/org.osbuild.oci-archive
index 16f12964..8704e50e 100755
--- a/stages/org.osbuild.oci-archive
+++ b/stages/org.osbuild.oci-archive
@@ -38,16 +38,15 @@ podman[3] with `podman pull oci-archive:<archive>`.
 
 
 import datetime
-import time
 import json
 import os
 import subprocess
 import sys
 import tempfile
+import time
 
 import osbuild.api
 
-
 DEFAULT_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 
diff --git a/stages/org.osbuild.oscap.remediation b/stages/org.osbuild.oscap.remediation
index e54f2f30..2e78286e 100755
--- a/stages/org.osbuild.oscap.remediation
+++ b/stages/org.osbuild.oscap.remediation
@@ -19,7 +19,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["config"],
diff --git a/stages/org.osbuild.ostree b/stages/org.osbuild.ostree
index 33b0f34e..361b70d5 100755
--- a/stages/org.osbuild.ostree
+++ b/stages/org.osbuild.ostree
@@ -22,8 +22,8 @@ the sysroot and the deployments. Additional kernel options can be passed via
 
 
 import os
-import sys
 import subprocess
+import sys
 
 import osbuild.api
 from osbuild.util import selinux
diff --git a/stages/org.osbuild.ostree.commit b/stages/org.osbuild.ostree.commit
index cf527669..fa467932 100755
--- a/stages/org.osbuild.ostree.commit
+++ b/stages/org.osbuild.ostree.commit
@@ -23,7 +23,6 @@ import tempfile
 from osbuild import api
 from osbuild.util import ostree
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN", "CAP_NET_ADMIN", "CAP_SYS_PTRACE"]
 
 
diff --git a/stages/org.osbuild.ostree.config b/stages/org.osbuild.ostree.config
index c7b60532..e9241b8a 100755
--- a/stages/org.osbuild.ostree.config
+++ b/stages/org.osbuild.ostree.config
@@ -11,12 +11,11 @@ See `ostree.repo-config(5)` for more information.
 """
 
 import os
-import sys
 import subprocess
+import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["repo"],
diff --git a/stages/org.osbuild.ostree.deploy b/stages/org.osbuild.ostree.deploy
index 2882568b..fc6a0799 100755
--- a/stages/org.osbuild.ostree.deploy
+++ b/stages/org.osbuild.ostree.deploy
@@ -20,8 +20,8 @@ the sysroot and the deployments. Additional kernel options can be passed via
 """
 
 import os
-import sys
 import subprocess
+import sys
 
 import osbuild.api
 from osbuild.util.mnt import MountGuard
diff --git a/stages/org.osbuild.ostree.fillvar b/stages/org.osbuild.ostree.fillvar
index c43d5324..e5b5eacd 100755
--- a/stages/org.osbuild.ostree.fillvar
+++ b/stages/org.osbuild.ostree.fillvar
@@ -5,13 +5,12 @@ Pre-populate /var directory for a given stateroot.
 
 
 import os
-import sys
 import subprocess
+import sys
 
 import osbuild.api
-from osbuild.util.mnt import MountGuard
 from osbuild.util import ostree
-
+from osbuild.util.mnt import MountGuard
 
 SCHEMA = """
 "additionalProperties": false,
diff --git a/stages/org.osbuild.ostree.init b/stages/org.osbuild.ostree.init
index db324c7d..47d79dc7 100755
--- a/stages/org.osbuild.ostree.init
+++ b/stages/org.osbuild.ostree.init
@@ -15,7 +15,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.ostree.init-fs b/stages/org.osbuild.ostree.init-fs
index 502433d0..9cc29a55 100755
--- a/stages/org.osbuild.ostree.init-fs
+++ b/stages/org.osbuild.ostree.init-fs
@@ -6,12 +6,11 @@ Creates the basic file system layout for an OSTree based system.
 """
 
 
-import sys
 import subprocess
+import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false
 """
diff --git a/stages/org.osbuild.ostree.os-init b/stages/org.osbuild.ostree.os-init
index fd9f5c34..8c71bd50 100755
--- a/stages/org.osbuild.ostree.os-init
+++ b/stages/org.osbuild.ostree.os-init
@@ -8,8 +8,8 @@ name `osname`.
 [1] https://ostree.readthedocs.io/en/latest/manual/deployment/
 """
 
-import sys
 import subprocess
+import sys
 
 import osbuild.api
 
diff --git a/stages/org.osbuild.ostree.passwd b/stages/org.osbuild.ostree.passwd
index 0922df51..88a2c2d4 100755
--- a/stages/org.osbuild.ostree.passwd
+++ b/stages/org.osbuild.ostree.passwd
@@ -14,14 +14,12 @@ in UIDs and GIDs.
 
 import contextlib
 import os
-import sys
 import subprocess
+import sys
 
 import osbuild.api
-
 from osbuild.util.ostree import PasswdLike, SubIdsDB
 
-
 SCHEMA_2 = """
 "options": {
   "additionalProperties": false
diff --git a/stages/org.osbuild.ostree.preptree b/stages/org.osbuild.ostree.preptree
index ed162c61..000eed74 100755
--- a/stages/org.osbuild.ostree.preptree
+++ b/stages/org.osbuild.ostree.preptree
@@ -42,7 +42,6 @@ import tempfile
 from osbuild import api
 from osbuild.util import ostree
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN", "CAP_NET_ADMIN", "CAP_SYS_PTRACE"]
 
 
diff --git a/stages/org.osbuild.ostree.pull b/stages/org.osbuild.ostree.pull
index a65da126..9fb40e7c 100755
--- a/stages/org.osbuild.ostree.pull
+++ b/stages/org.osbuild.ostree.pull
@@ -12,12 +12,11 @@ that to pull the commits.
 
 
 import os
-import sys
 import subprocess
+import sys
 
 import osbuild.api
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN"]
 
 
diff --git a/stages/org.osbuild.ostree.remotes b/stages/org.osbuild.ostree.remotes
index 1bd22de6..60fe21de 100755
--- a/stages/org.osbuild.ostree.remotes
+++ b/stages/org.osbuild.ostree.remotes
@@ -5,12 +5,11 @@ Configure OSTree remotes for a repository.
 
 
 import os
-import sys
 import subprocess
+import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["repo"],
diff --git a/stages/org.osbuild.ostree.selinux b/stages/org.osbuild.ostree.selinux
index 895867df..f0f716fb 100755
--- a/stages/org.osbuild.ostree.selinux
+++ b/stages/org.osbuild.ostree.selinux
@@ -10,9 +10,7 @@ import os
 import sys
 
 import osbuild.api
-from osbuild.util import ostree
-from osbuild.util import selinux
-
+from osbuild.util import ostree, selinux
 
 CAPABILITIES = ["CAP_MAC_ADMIN"]
 
diff --git a/stages/org.osbuild.pacman b/stages/org.osbuild.pacman
index e2f99ef5..822d8976 100755
--- a/stages/org.osbuild.pacman
+++ b/stages/org.osbuild.pacman
@@ -23,7 +23,6 @@ import pyalpm
 
 from osbuild import api
 
-
 SCHEMA_2 = """
 "options": {
   "type": "object",
diff --git a/stages/org.osbuild.pacman.conf b/stages/org.osbuild.pacman.conf
index fa4f021d..30e612af 100755
--- a/stages/org.osbuild.pacman.conf
+++ b/stages/org.osbuild.pacman.conf
@@ -7,7 +7,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.pacman.mirrorlist.conf b/stages/org.osbuild.pacman.mirrorlist.conf
index 95cb260c..ec5cebfc 100755
--- a/stages/org.osbuild.pacman.mirrorlist.conf
+++ b/stages/org.osbuild.pacman.mirrorlist.conf
@@ -8,7 +8,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.pam.limits.conf b/stages/org.osbuild.pam.limits.conf
index ec240533..963ff21b 100755
--- a/stages/org.osbuild.pam.limits.conf
+++ b/stages/org.osbuild.pam.limits.conf
@@ -13,7 +13,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "configuration": {
diff --git a/stages/org.osbuild.parted b/stages/org.osbuild.parted
index 74f2728c..03e38ace 100755
--- a/stages/org.osbuild.parted
+++ b/stages/org.osbuild.parted
@@ -11,10 +11,8 @@ Buildhost commands used: `parted`.
 import subprocess
 import sys
 
-
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",
diff --git a/stages/org.osbuild.pwquality.conf b/stages/org.osbuild.pwquality.conf
index a119a932..80f5dc5d 100755
--- a/stages/org.osbuild.pwquality.conf
+++ b/stages/org.osbuild.pwquality.conf
@@ -12,7 +12,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["config"],
diff --git a/stages/org.osbuild.qemu b/stages/org.osbuild.qemu
index ba0b22d9..98a04f00 100755
--- a/stages/org.osbuild.qemu
+++ b/stages/org.osbuild.qemu
@@ -18,7 +18,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "definitions": {
   "qcow2": {
diff --git a/stages/org.osbuild.resolv-conf b/stages/org.osbuild.resolv-conf
index c902dfda..10123b83 100755
--- a/stages/org.osbuild.resolv-conf
+++ b/stages/org.osbuild.resolv-conf
@@ -16,7 +16,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.rhsm b/stages/org.osbuild.rhsm
index 95155be8..7132ab23 100755
--- a/stages/org.osbuild.rhsm
+++ b/stages/org.osbuild.rhsm
@@ -23,11 +23,11 @@ subscription-manager to modify its configuration file.
 """
 
 import sys
+
 import iniparse
 
 import osbuild.api
 
-
 SCHEMA = """
 "definitions": {
   "plugins": {
diff --git a/stages/org.osbuild.rhsm.facts b/stages/org.osbuild.rhsm.facts
index 4a6d1632..75f1e249 100755
--- a/stages/org.osbuild.rhsm.facts
+++ b/stages/org.osbuild.rhsm.facts
@@ -10,7 +10,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "properties": {
   "facts": {
diff --git a/stages/org.osbuild.rpm b/stages/org.osbuild.rpm
index 636a8972..5551b515 100755
--- a/stages/org.osbuild.rpm
+++ b/stages/org.osbuild.rpm
@@ -41,9 +41,8 @@ import sys
 import tempfile
 from operator import itemgetter
 
-from osbuild.util.mnt import mount
 from osbuild import api
-
+from osbuild.util.mnt import mount
 
 SCHEMA = """
 "additionalProperties": false,
diff --git a/stages/org.osbuild.rpm-ostree b/stages/org.osbuild.rpm-ostree
index d2a0a519..a03f0116 100755
--- a/stages/org.osbuild.rpm-ostree
+++ b/stages/org.osbuild.rpm-ostree
@@ -38,7 +38,6 @@ import sys
 import osbuild.api
 from osbuild.util import ostree
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN", "CAP_NET_ADMIN", "CAP_SYS_PTRACE"]
 
 
diff --git a/stages/org.osbuild.rpm.macros b/stages/org.osbuild.rpm.macros
index 0573f590..8dd82502 100755
--- a/stages/org.osbuild.rpm.macros
+++ b/stages/org.osbuild.rpm.macros
@@ -10,7 +10,6 @@ import sys
 
 import osbuild
 
-
 SCHEMA = r"""
 "additionalProperties": false,
 "required": ["macros", "filename"],
diff --git a/stages/org.osbuild.rpmkeys.import b/stages/org.osbuild.rpmkeys.import
index 5dce69fb..d5dba3cd 100755
--- a/stages/org.osbuild.rpmkeys.import
+++ b/stages/org.osbuild.rpmkeys.import
@@ -9,7 +9,6 @@ import sys
 
 import osbuild
 
-
 SCHEMA_2 = r"""
 "inputs": {
   "type": "object",
diff --git a/stages/org.osbuild.selinux b/stages/org.osbuild.selinux
index f0ab7cd8..6c9c0360 100755
--- a/stages/org.osbuild.selinux
+++ b/stages/org.osbuild.selinux
@@ -28,7 +28,6 @@ import sys
 import osbuild.api
 from osbuild.util import selinux
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN"]
 
 
diff --git a/stages/org.osbuild.selinux.config b/stages/org.osbuild.selinux.config
index f5637c77..1f18cd58 100755
--- a/stages/org.osbuild.selinux.config
+++ b/stages/org.osbuild.selinux.config
@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "description": "SELinux state configuration.",
diff --git a/stages/org.osbuild.sfdisk b/stages/org.osbuild.sfdisk
index 1787406d..0be87505 100755
--- a/stages/org.osbuild.sfdisk
+++ b/stages/org.osbuild.sfdisk
@@ -6,12 +6,10 @@ Partition a target using sfdisk(8)
 import json
 import subprocess
 import sys
-
 from typing import Optional
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",
diff --git a/stages/org.osbuild.sgdisk b/stages/org.osbuild.sgdisk
index 21a8f20c..c90d4e62 100755
--- a/stages/org.osbuild.sgdisk
+++ b/stages/org.osbuild.sgdisk
@@ -10,7 +10,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "devices": {
   "type": "object",
diff --git a/stages/org.osbuild.skopeo b/stages/org.osbuild.skopeo
index 462726a6..0ed5e027 100755
--- a/stages/org.osbuild.skopeo
+++ b/stages/org.osbuild.skopeo
@@ -14,7 +14,6 @@ import tempfile
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "inputs": {
   "type": "object",
diff --git a/stages/org.osbuild.squashfs b/stages/org.osbuild.squashfs
index 79812230..71eee41b 100755
--- a/stages/org.osbuild.squashfs
+++ b/stages/org.osbuild.squashfs
@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = """
 "options": {
   "additionalProperties": false,
diff --git a/stages/org.osbuild.sshd.config b/stages/org.osbuild.sshd.config
index b54ee642..2936db31 100755
--- a/stages/org.osbuild.sshd.config
+++ b/stages/org.osbuild.sshd.config
@@ -12,7 +12,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["config"],
diff --git a/stages/org.osbuild.sysconfig b/stages/org.osbuild.sysconfig
index 73451b50..63ea77f8 100755
--- a/stages/org.osbuild.sysconfig
+++ b/stages/org.osbuild.sysconfig
@@ -51,12 +51,11 @@ This stage will overwrite existing files.
 
 """
 
-import sys
 import os
+import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.sysctld b/stages/org.osbuild.sysctld
index 4282207c..3d56bf98 100755
--- a/stages/org.osbuild.sysctld
+++ b/stages/org.osbuild.sysctld
@@ -24,7 +24,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "parameter": {
diff --git a/stages/org.osbuild.systemd b/stages/org.osbuild.systemd
index 45b2de1f..ffe875f0 100755
--- a/stages/org.osbuild.systemd
+++ b/stages/org.osbuild.systemd
@@ -29,7 +29,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.systemd-logind b/stages/org.osbuild.systemd-logind
index 84a8df7e..625f8012 100755
--- a/stages/org.osbuild.systemd-logind
+++ b/stages/org.osbuild.systemd-logind
@@ -15,13 +15,12 @@ At least one option must be specified in the 'Login' section.
 """
 
 
+import configparser
 import os
 import sys
-import configparser
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "additionalProperties": false,
 "required": ["config", "filename"],
diff --git a/stages/org.osbuild.systemd.unit b/stages/org.osbuild.systemd.unit
index 690643b6..d290fec5 100755
--- a/stages/org.osbuild.systemd.unit
+++ b/stages/org.osbuild.systemd.unit
@@ -16,13 +16,12 @@ of options:
     - 'Environment' option
 """
 
+import configparser
 import os
 import sys
-import configparser
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "additionalProperties": false,
 "required": ["unit", "dropin", "config"],
diff --git a/stages/org.osbuild.tar b/stages/org.osbuild.tar
index 90b171fa..f42ccd9d 100755
--- a/stages/org.osbuild.tar
+++ b/stages/org.osbuild.tar
@@ -20,7 +20,6 @@ import sys
 
 import osbuild.api
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN"]
 
 
diff --git a/stages/org.osbuild.test b/stages/org.osbuild.test
index 6c4719fb..d1fd3c53 100755
--- a/stages/org.osbuild.test
+++ b/stages/org.osbuild.test
@@ -15,7 +15,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["script"],
diff --git a/stages/org.osbuild.timezone b/stages/org.osbuild.timezone
index 648b246b..31e85b7c 100755
--- a/stages/org.osbuild.timezone
+++ b/stages/org.osbuild.timezone
@@ -10,13 +10,12 @@ the `--timezone` option, which will re-create `/etc/localtime`.
 """
 
 
+import os
 import subprocess
 import sys
-import os
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["zone"],
diff --git a/stages/org.osbuild.tmpfilesd b/stages/org.osbuild.tmpfilesd
index 53db3c84..ed633d13 100755
--- a/stages/org.osbuild.tmpfilesd
+++ b/stages/org.osbuild.tmpfilesd
@@ -13,7 +13,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "configuration": {
diff --git a/stages/org.osbuild.truncate b/stages/org.osbuild.truncate
index e641719d..b3e9b25b 100755
--- a/stages/org.osbuild.truncate
+++ b/stages/org.osbuild.truncate
@@ -22,7 +22,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["filename", "size"],
diff --git a/stages/org.osbuild.tuned b/stages/org.osbuild.tuned
index 371d17c8..45579b6f 100755
--- a/stages/org.osbuild.tuned
+++ b/stages/org.osbuild.tuned
@@ -15,7 +15,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["profiles"],
diff --git a/stages/org.osbuild.udev.rules b/stages/org.osbuild.udev.rules
index 4fec2841..41df2402 100755
--- a/stages/org.osbuild.udev.rules
+++ b/stages/org.osbuild.udev.rules
@@ -17,12 +17,10 @@ and the possible keys for the `OPTIONS` assignment are not checked.
 
 import os
 import sys
-
 from typing import Dict
 
 import osbuild.api
 
-
 SCHEMA = r"""
   "definitions": {
     "value": {
diff --git a/stages/org.osbuild.untar b/stages/org.osbuild.untar
index f542372d..7f175bd6 100755
--- a/stages/org.osbuild.untar
+++ b/stages/org.osbuild.untar
@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 CAPABILITIES = ["CAP_MAC_ADMIN"]
 
 
diff --git a/stages/org.osbuild.users b/stages/org.osbuild.users
index 2929ece3..f7449a93 100755
--- a/stages/org.osbuild.users
+++ b/stages/org.osbuild.users
@@ -11,13 +11,12 @@ assumptions about its host system.
 """
 
 
+import os
 import subprocess
 import sys
-import os
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.vagrant b/stages/org.osbuild.vagrant
index 77201f4a..0c69bd36 100755
--- a/stages/org.osbuild.vagrant
+++ b/stages/org.osbuild.vagrant
@@ -16,8 +16,8 @@ vagrant up
 
 import json
 import os
-import sys
 import subprocess
+import sys
 
 import osbuild.api
 
diff --git a/stages/org.osbuild.waagent.conf b/stages/org.osbuild.waagent.conf
index ddc17e19..073b51b0 100755
--- a/stages/org.osbuild.waagent.conf
+++ b/stages/org.osbuild.waagent.conf
@@ -12,7 +12,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "required": ["config"],
diff --git a/stages/org.osbuild.xorrisofs b/stages/org.osbuild.xorrisofs
index 13c8fdde..9884d5de 100755
--- a/stages/org.osbuild.xorrisofs
+++ b/stages/org.osbuild.xorrisofs
@@ -21,7 +21,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "options": {
   "additionalProperties": false,
diff --git a/stages/org.osbuild.xz b/stages/org.osbuild.xz
index a1c1144e..54547349 100755
--- a/stages/org.osbuild.xz
+++ b/stages/org.osbuild.xz
@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "inputs": {
   "type": "object",
diff --git a/stages/org.osbuild.yum.config b/stages/org.osbuild.yum.config
index 8c3ade3b..fc3f30c4 100755
--- a/stages/org.osbuild.yum.config
+++ b/stages/org.osbuild.yum.config
@@ -8,11 +8,11 @@ are created.
 """
 import os
 import sys
+
 import iniparse
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "additionalProperties": false,
 "description": "YUM configuration.",
diff --git a/stages/org.osbuild.yum.repos b/stages/org.osbuild.yum.repos
index 1c50571b..a55f067c 100755
--- a/stages/org.osbuild.yum.repos
+++ b/stages/org.osbuild.yum.repos
@@ -12,13 +12,12 @@ configuration, is supported, specifically:
   - repo_gpgcheck
 """
 
+import configparser
 import os
 import sys
-import configparser
 
 import osbuild.api
 
-
 SCHEMA = r"""
 "definitions": {
   "repo": {
diff --git a/stages/org.osbuild.zipl b/stages/org.osbuild.zipl
index 32fde5dd..b48efefa 100755
--- a/stages/org.osbuild.zipl
+++ b/stages/org.osbuild.zipl
@@ -11,7 +11,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA = """
 "additionalProperties": false,
 "properties": {
diff --git a/stages/org.osbuild.zipl.inst b/stages/org.osbuild.zipl.inst
index 3291a288..a9bea045 100755
--- a/stages/org.osbuild.zipl.inst
+++ b/stages/org.osbuild.zipl.inst
@@ -17,7 +17,6 @@ import sys
 
 import osbuild.api
 
-
 SCHEMA_2 = r"""
 "options": {
   "additionalProperties": false,
diff --git a/test/cases/ostree-images b/test/cases/ostree-images
index b653e7ee..dcc1206c 100755
--- a/test/cases/ostree-images
+++ b/test/cases/ostree-images
@@ -4,11 +4,10 @@
 
 import argparse
 import os
-import tempfile
-import time
 import subprocess
 import sys
-
+import tempfile
+import time
 
 RESET = "\033[0m"
 GREEN = "\033[32m"
diff --git a/test/data/scripts/mount_flags.py b/test/data/scripts/mount_flags.py
index fc9529f0..3282e290 100755
--- a/test/data/scripts/mount_flags.py
+++ b/test/data/scripts/mount_flags.py
@@ -7,7 +7,6 @@ import argparse
 import os
 import sys
 
-
 # from /usr/include/sys/mount.h
 # these are file-system independent
 MS_RDONLY = 1
diff --git a/test/mod/test_api.py b/test/mod/test_api.py
index c21f4d93..98afe453 100644
--- a/test/mod/test_api.py
+++ b/test/mod/test_api.py
@@ -2,8 +2,8 @@
 # Test for API infrastructure
 #
 
-import os
 import multiprocessing as mp
+import os
 import tempfile
 import unittest
 
diff --git a/test/mod/test_buildroot.py b/test/mod/test_buildroot.py
index 26209bb4..3782000c 100644
--- a/test/mod/test_buildroot.py
+++ b/test/mod/test_buildroot.py
@@ -2,10 +2,9 @@
 # Test for the build root
 #
 
-import pathlib
 import os
+import pathlib
 import sys
-
 from tempfile import TemporaryDirectory
 
 import pytest
diff --git a/test/mod/test_fmt_v1.py b/test/mod/test_fmt_v1.py
index aefc7b2f..20f7bee7 100644
--- a/test/mod/test_fmt_v1.py
+++ b/test/mod/test_fmt_v1.py
@@ -14,8 +14,8 @@ import osbuild.meta
 from osbuild.formats import v1 as fmt
 from osbuild.monitor import NullMonitor
 from osbuild.objectstore import ObjectStore
-from .. import test
 
+from .. import test
 
 BASIC_PIPELINE = {
     "sources": {
diff --git a/test/mod/test_fmt_v2.py b/test/mod/test_fmt_v2.py
index b582cb54..48c7821d 100644
--- a/test/mod/test_fmt_v2.py
+++ b/test/mod/test_fmt_v2.py
@@ -10,7 +10,6 @@ import unittest
 import osbuild
 import osbuild.meta
 
-
 BASIC_PIPELINE = {
     "version": "2",
     "sources": {
diff --git a/test/mod/test_loop.py b/test/mod/test_loop.py
index 4d2076b4..99d58078 100644
--- a/test/mod/test_loop.py
+++ b/test/mod/test_loop.py
@@ -5,8 +5,8 @@
 import contextlib
 import fcntl
 import os
-import time
 import threading
+import time
 from tempfile import TemporaryDirectory, TemporaryFile
 
 import pytest
diff --git a/test/mod/test_monitor.py b/test/mod/test_monitor.py
index fb1dcce8..3d30c7ea 100644
--- a/test/mod/test_monitor.py
+++ b/test/mod/test_monitor.py
@@ -14,6 +14,7 @@ import osbuild.meta
 from osbuild.monitor import LogMonitor
 from osbuild.objectstore import ObjectStore
 from osbuild.pipeline import detect_host_runner
+
 from .. import test
 
 
diff --git a/test/mod/test_objectstore.py b/test/mod/test_objectstore.py
index 13fe8daa..883f7ee0 100644
--- a/test/mod/test_objectstore.py
+++ b/test/mod/test_objectstore.py
@@ -7,9 +7,10 @@ import os
 import shutil
 import tempfile
 import unittest
-
 from pathlib import Path
+
 from osbuild import objectstore
+
 from .. import test
 
 
diff --git a/test/mod/test_osbuild.py b/test/mod/test_osbuild.py
index 693b3241..245e6267 100644
--- a/test/mod/test_osbuild.py
+++ b/test/mod/test_osbuild.py
@@ -14,6 +14,7 @@ import osbuild.meta
 from osbuild.monitor import NullMonitor
 from osbuild.objectstore import ObjectStore
 from osbuild.pipeline import Manifest, detect_host_runner
+
 from .. import test
 
 
diff --git a/test/mod/test_util_checksum.py b/test/mod/test_util_checksum.py
index 557a7ea2..bff00843 100644
--- a/test/mod/test_util_checksum.py
+++ b/test/mod/test_util_checksum.py
@@ -2,11 +2,11 @@
 # Test for the util.checksum module
 #
 from tempfile import NamedTemporaryFile
+
 import pytest
 
 from osbuild.util import checksum
 
-
 # pylint: disable=line-too-long
 TEST_STRING = "I have of late, but wherefore I know not, lost all my bytes\n"
 TEST_RESULT = {
diff --git a/test/mod/test_util_lorax.py b/test/mod/test_util_lorax.py
index dada02a7..f8fdcfc1 100644
--- a/test/mod/test_util_lorax.py
+++ b/test/mod/test_util_lorax.py
@@ -3,14 +3,13 @@
 #
 
 import os
-import tempfile
 import subprocess
+import tempfile
 
 import osbuild.util.lorax as lorax
 
 from .. import test
 
-
 BASIC_TEMPLATE = """
 # This is a comment
 <%page args="tree, name"/>
diff --git a/test/mod/test_util_lvm2.py b/test/mod/test_util_lvm2.py
index 0042e794..ca57b0cd 100644
--- a/test/mod/test_util_lvm2.py
+++ b/test/mod/test_util_lvm2.py
@@ -2,14 +2,13 @@
 # Test for the util.lvm2 module
 #
 
-import os
 import json
+import os
 import subprocess
 import time
 import uuid
-
-from typing import List
 from tempfile import TemporaryDirectory
+from typing import List
 
 import pytest
 
diff --git a/test/mod/test_util_ostree.py b/test/mod/test_util_ostree.py
index cb5ffcff..f70e4889 100644
--- a/test/mod/test_util_ostree.py
+++ b/test/mod/test_util_ostree.py
@@ -8,6 +8,7 @@ import os
 import subprocess
 import tempfile
 import unittest
+
 import pytest
 
 from osbuild.util import ostree
diff --git a/test/run/test_assemblers.py b/test/run/test_assemblers.py
index 3e58668d..5a31a17c 100644
--- a/test/run/test_assemblers.py
+++ b/test/run/test_assemblers.py
@@ -11,6 +11,7 @@ import tempfile
 import unittest
 
 from osbuild import loop
+
 from .. import test
 
 MEBIBYTE = 1024 * 1024
diff --git a/test/run/test_noop.py b/test/run/test_noop.py
index 9add5fb1..63e080ea 100644
--- a/test/run/test_noop.py
+++ b/test/run/test_noop.py
@@ -4,6 +4,7 @@
 
 import json
 import tempfile
+
 import pytest
 
 from .. import test
diff --git a/test/run/test_sources.py b/test/run/test_sources.py
index 4d14e8af..ceda924a 100644
--- a/test/run/test_sources.py
+++ b/test/run/test_sources.py
@@ -14,10 +14,11 @@ import threading
 
 import pytest
 
-import osbuild.objectstore
 import osbuild.meta
+import osbuild.objectstore
 import osbuild.sources
 from osbuild import host
+
 from .. import test
 
 
diff --git a/test/run/test_stages.py b/test/run/test_stages.py
index 593e5916..7def238b 100644
--- a/test/run/test_stages.py
+++ b/test/run/test_stages.py
@@ -17,8 +17,8 @@ from collections.abc import Mapping
 from typing import Dict
 
 from osbuild.util import selinux
-from .. import initrd
-from .. import test
+
+from .. import initrd, test
 
 
 def have_sfdisk_with_json():
diff --git a/test/test.py b/test/test.py
index 781d7754..92664573 100644
--- a/test/test.py
+++ b/test/test.py
@@ -203,6 +203,7 @@ class TestBase(unittest.TestCase):
 
         return r.returncode == 0 and "mypy" in r.stdout
 
+    @staticmethod
     def have_isort() -> bool:
         """Check isort Availability
 
diff --git a/tools/lorax-template-pkgs.py b/tools/lorax-template-pkgs.py
index 0e5a2f8c..09df8941 100755
--- a/tools/lorax-template-pkgs.py
+++ b/tools/lorax-template-pkgs.py
@@ -18,8 +18,8 @@ import dnf
 import dnf.conf
 import dnf.conf.read
 
-from osbuild.util.lorax import render_template
 import osbuild.util.osrelease as ostrelease
+from osbuild.util.lorax import render_template
 
 
 class DepSolver:
diff --git a/tools/osbuild-mpp b/tools/osbuild-mpp
index 9ac6a67d..fff74d46 100755
--- a/tools/osbuild-mpp
+++ b/tools/osbuild-mpp
@@ -305,7 +305,6 @@ import collections
 import contextlib
 import hashlib
 import json
-import yaml
 import os
 import pathlib
 import string
@@ -316,9 +315,10 @@ import urllib.parse
 import urllib.request
 from typing import Dict, Optional
 
-import rpm
 import dnf
 import hawkey
+import rpm
+import yaml
 
 from osbuild.util.rhsm import Subscriptions