diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index aeffd9cf9e..38379d38f5 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -11,4 +11,3 @@ jobs:
     secrets: inherit
     with:
       linkcheck-files: "'*.md' 'docs/**/*.md' 'terraform/**/*.md' './**/*.rst'"
-
diff --git a/github-runner-manager/pyproject.toml b/github-runner-manager/pyproject.toml
index d485400770..e01bbb8327 100644
--- a/github-runner-manager/pyproject.toml
+++ b/github-runner-manager/pyproject.toml
@@ -48,8 +48,8 @@ omit = [
 fail_under = 73
 show_missing = true
 
-
 [tool.pylint.'MESSAGES CONTROL']
+good-names = ["ParamT", "ReturnT"]
 # see https://github.com/pydantic/pydantic/issues/1961#issuecomment-759522422
 extension-pkg-whitelist = "pydantic"
 # Ignore W0511 TODO comments because the functions are subject to refactor.
diff --git a/pyproject.toml b/pyproject.toml
index 25bb82caa4..e5121fb41b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,6 +27,7 @@ markers = [
 ]
 
 [tool.pylint.'MESSAGES CONTROL']
+good-names = ["ParamT", "ReturnT"]
 # see https://github.com/pydantic/pydantic/issues/1961#issuecomment-759522422
 extension-pkg-whitelist = "pydantic"
 # Ignore W0511 TODO comments because the functions are subject to refactor.
diff --git a/src/manager_service.py b/src/manager_service.py
index ac3b5b1479..1427c6c28f 100644
--- a/src/manager_service.py
+++ b/src/manager_service.py
@@ -200,6 +200,7 @@ def _setup_service_file(config_file: Path, log_file: Path, log_level: str) -> No
         f"""\
         [Unit]
         Description=Runs the github-runner-manager service
+        StartLimitIntervalSec=0
 
         [Service]
         Type=simple
@@ -209,6 +210,9 @@ def _setup_service_file(config_file: Path, log_file: Path, log_level: str) -> No
 {GITHUB_RUNNER_MANAGER_ADDRESS} --port {GITHUB_RUNNER_MANAGER_PORT} \
 --python-path {str(python_path)} --log-level {log_level}
         Restart=on-failure
+        RestartSec=30
+        RestartSteps=5
+        RestartMaxDelaySec=600
         KillMode=process
         StandardOutput=append:{log_file}
         StandardError=append:{log_file}
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index b50ff03ab8..bf9f9a01a7 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -587,7 +587,10 @@ async def app_no_wait_fixture(
 @pytest_asyncio.fixture(scope="module", name="tmate_ssh_server_app")
 async def tmate_ssh_server_app_fixture(model: Model) -> AsyncIterator[Application]:
     """tmate-ssh-server charm application related to GitHub-Runner app charm."""
-    tmate_app: Application = await model.deploy("tmate-ssh-server", channel="edge")
+    tmate_app: Application = await model.deploy(
+        "tmate-ssh-server",
+        channel="edge",
+    )
     return tmate_app