diff --git a/bin/validate-raythena-job.py b/bin/validate-raythena-job.py
index 5e5a295..0f1cf92 100644
--- a/bin/validate-raythena-job.py
+++ b/bin/validate-raythena-job.py
@@ -4,7 +4,6 @@
 import json
 import os.path as path
 from array import array
-
 import ROOT
 
 
diff --git a/example/standalone_ray_test_hello_world.py b/example/standalone_ray_test_hello_world.py
index d7dbae4..2c4e2ea 100755
--- a/example/standalone_ray_test_hello_world.py
+++ b/example/standalone_ray_test_hello_world.py
@@ -11,7 +11,6 @@
 import platform
 import time
 from pprint import pprint
-
 import ray
 
 
diff --git a/pyproject.toml b/pyproject.toml
index 2a23446..ea3c1ca 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -69,3 +69,6 @@ ignore = [
   # pycodestyle
   "E501",
 ]
+
+[tool.ruff.lint.isort]
+no-lines-before = ["third-party", "first-party", "standard-library"]
diff --git a/src/raythena/actors/esworker.py b/src/raythena/actors/esworker.py
index d481443..a2987cc 100644
--- a/src/raythena/actors/esworker.py
+++ b/src/raythena/actors/esworker.py
@@ -9,9 +9,7 @@
 from socket import gethostname
 from time import sleep
 from typing import Any, Optional, Union
-
 import ray
-
 # from raythena.utils.timing import CPUMonitor
 from raythena.actors.payloads.basePayload import BasePayload
 from raythena.actors.payloads.eventservice.esPayload import ESPayload
diff --git a/src/raythena/actors/payloads/basePayload.py b/src/raythena/actors/payloads/basePayload.py
index 4a0c8f4..030ca46 100644
--- a/src/raythena/actors/payloads/basePayload.py
+++ b/src/raythena/actors/payloads/basePayload.py
@@ -1,6 +1,5 @@
 from abc import ABC, abstractmethod
 from typing import Any, Optional
-
 from raythena.utils.config import Config
 from raythena.utils.eventservice import PandaJob
 
diff --git a/src/raythena/actors/payloads/eventservice/esPayload.py b/src/raythena/actors/payloads/eventservice/esPayload.py
index 2ec00d1..4ac4328 100644
--- a/src/raythena/actors/payloads/eventservice/esPayload.py
+++ b/src/raythena/actors/payloads/eventservice/esPayload.py
@@ -1,7 +1,6 @@
 from abc import abstractmethod
 from collections.abc import Sequence
 from typing import Optional
-
 from raythena.actors.payloads.basePayload import BasePayload
 from raythena.utils.config import Config
 from raythena.utils.eventservice import EventRange
diff --git a/src/raythena/actors/payloads/eventservice/pilothttp.py b/src/raythena/actors/payloads/eventservice/pilothttp.py
index 8160806..d7115d0 100644
--- a/src/raythena/actors/payloads/eventservice/pilothttp.py
+++ b/src/raythena/actors/payloads/eventservice/pilothttp.py
@@ -9,10 +9,8 @@
 from subprocess import DEVNULL, Popen
 from typing import Callable, Optional
 from urllib.parse import parse_qs
-
 import uvloop
 from aiohttp import web
-
 from raythena.actors.payloads.eventservice.esPayload import ESPayload
 from raythena.utils.config import Config
 from raythena.utils.eventservice import ESEncoder, EventRange, PandaJob
diff --git a/src/raythena/drivers/baseDriver.py b/src/raythena/drivers/baseDriver.py
index 344d67e..464cfc6 100644
--- a/src/raythena/drivers/baseDriver.py
+++ b/src/raythena/drivers/baseDriver.py
@@ -1,5 +1,4 @@
 from abc import ABC, abstractmethod
-
 from raythena.utils.config import Config
 
 
diff --git a/src/raythena/drivers/communicators/baseCommunicator.py b/src/raythena/drivers/communicators/baseCommunicator.py
index 2ca75d6..257ec05 100644
--- a/src/raythena/drivers/communicators/baseCommunicator.py
+++ b/src/raythena/drivers/communicators/baseCommunicator.py
@@ -2,7 +2,6 @@
 from collections.abc import Mapping, Sequence
 from queue import Queue
 from typing import Union
-
 from raythena.utils.config import Config
 from raythena.utils.eventservice import (
     EventRangeDef,
diff --git a/src/raythena/drivers/communicators/harvesterFileMessenger.py b/src/raythena/drivers/communicators/harvesterFileMessenger.py
index 57c8d07..5f57e0e 100644
--- a/src/raythena/drivers/communicators/harvesterFileMessenger.py
+++ b/src/raythena/drivers/communicators/harvesterFileMessenger.py
@@ -5,7 +5,6 @@
 import shutil
 import time
 from queue import Queue
-
 from raythena.drivers.communicators.baseCommunicator import BaseCommunicator
 from raythena.utils.config import Config
 from raythena.utils.eventservice import (
diff --git a/src/raythena/drivers/communicators/harvesterMock.py b/src/raythena/drivers/communicators/harvesterMock.py
index dedf8a3..cfc5b4a 100644
--- a/src/raythena/drivers/communicators/harvesterMock.py
+++ b/src/raythena/drivers/communicators/harvesterMock.py
@@ -3,7 +3,6 @@
 import random
 import time
 from queue import Queue
-
 from raythena.drivers.communicators.baseCommunicator import BaseCommunicator
 from raythena.utils.config import Config
 from raythena.utils.eventservice import (
diff --git a/src/raythena/drivers/communicators/harvesterMock2205.py b/src/raythena/drivers/communicators/harvesterMock2205.py
index 4f7cdc1..b2bab50 100644
--- a/src/raythena/drivers/communicators/harvesterMock2205.py
+++ b/src/raythena/drivers/communicators/harvesterMock2205.py
@@ -3,7 +3,6 @@
 import random
 import time
 from queue import Queue
-
 from raythena.drivers.communicators.harvesterMock import HarvesterMock
 from raythena.utils.config import Config
 from raythena.utils.eventservice import PandaJobRequest
diff --git a/src/raythena/drivers/esdriver.py b/src/raythena/drivers/esdriver.py
index c54fdf9..238bf6e 100644
--- a/src/raythena/drivers/esdriver.py
+++ b/src/raythena/drivers/esdriver.py
@@ -16,11 +16,9 @@
     Any,
     Optional,
 )
-
 import ray
 from ray.exceptions import RayActorError
 from ray.types import ObjectRef
-
 from raythena import __version__
 from raythena.actors.esworker import ESWorker, WorkerResponse
 from raythena.drivers.baseDriver import BaseDriver
diff --git a/src/raythena/scripts/raythena.py b/src/raythena/scripts/raythena.py
index f4dd1a9..2a1c49a 100755
--- a/src/raythena/scripts/raythena.py
+++ b/src/raythena/scripts/raythena.py
@@ -3,9 +3,7 @@
 import signal
 import traceback
 import types
-
 import click
-
 from raythena.drivers.baseDriver import BaseDriver
 from raythena.drivers.esdriver import ESDriver
 from raythena.utils.config import Config
diff --git a/src/raythena/utils/bookkeeper.py b/src/raythena/utils/bookkeeper.py
index f26df7f..b5bc3d1 100644
--- a/src/raythena/utils/bookkeeper.py
+++ b/src/raythena/utils/bookkeeper.py
@@ -11,7 +11,6 @@
     Optional,
     Union,
 )
-
 from raythena.utils.config import Config
 from raythena.utils.eventservice import (
     EventRange,
diff --git a/src/raythena/utils/config.py b/src/raythena/utils/config.py
index 29a6f39..13170e2 100644
--- a/src/raythena/utils/config.py
+++ b/src/raythena/utils/config.py
@@ -1,5 +1,4 @@
 import os
-
 import yaml
 
 
diff --git a/src/raythena/utils/logging.py b/src/raythena/utils/logging.py
index 7716827..dc2123d 100644
--- a/src/raythena/utils/logging.py
+++ b/src/raythena/utils/logging.py
@@ -1,7 +1,6 @@
 import logging
 import sys
 from time import gmtime
-
 from raythena.utils.config import Config
 
 _initialized = False
diff --git a/src/raythena/utils/ray.py b/src/raythena/utils/ray.py
index f3fa1bd..297021f 100644
--- a/src/raythena/utils/ray.py
+++ b/src/raythena/utils/ray.py
@@ -1,8 +1,6 @@
 from collections.abc import Mapping
 from typing import Any
-
 import ray
-
 from raythena.utils.config import Config
 
 
diff --git a/src/raythena/utils/timing.py b/src/raythena/utils/timing.py
index 62f9e0b..6d87663 100644
--- a/src/raythena/utils/timing.py
+++ b/src/raythena/utils/timing.py
@@ -2,9 +2,7 @@
 import time
 from threading import Event
 from typing import Any, Union
-
 import psutil
-
 from raythena.utils.exception import ExThread
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
index c1c3577..a17b52d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,5 @@
 import hashlib
 import time
-
 import pytest
 from raythena.utils.config import Config
 from raythena.utils.ray import setup_ray, shutdown_ray
diff --git a/tests/harvester/conftest.py b/tests/harvester/conftest.py
index 301f18d..65c7ecb 100644
--- a/tests/harvester/conftest.py
+++ b/tests/harvester/conftest.py
@@ -1,6 +1,5 @@
 import os
 import queue
-
 import pytest
 from raythena.drivers.communicators.harvesterFileMessenger import (
     HarvesterFileCommunicator,
diff --git a/tests/harvester/test_harvesterFileMessenger.py b/tests/harvester/test_harvesterFileMessenger.py
index 85469b6..a377e9d 100644
--- a/tests/harvester/test_harvesterFileMessenger.py
+++ b/tests/harvester/test_harvesterFileMessenger.py
@@ -1,7 +1,6 @@
 import json
 import os
 import time
-
 from raythena.utils.eventservice import EventRangeRequest, PandaJobRequest
 
 
diff --git a/tests/test_pilothttp.py b/tests/test_pilothttp.py
index f2c5316..5c1c4b3 100644
--- a/tests/test_pilothttp.py
+++ b/tests/test_pilothttp.py
@@ -1,6 +1,5 @@
 import os
 import time
-
 import pytest
 import requests
 from raythena.actors.payloads.eventservice.pilothttp import PilotHttpPayload
diff --git a/tests/test_ray_utils.py b/tests/test_ray_utils.py
index 34e1f1b..3c70875 100644
--- a/tests/test_ray_utils.py
+++ b/tests/test_ray_utils.py
@@ -1,5 +1,4 @@
 import socket
-
 import pytest
 from raythena.utils.ray import (
     build_nodes_resource_list,