diff --git a/Makefile b/Makefile
index e0d0b4b1..05de1ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 override SERVICE=auth
+override DEV_DC=CONTEXT="dev" docker compose -f docker-compose.dev.yml
 override TEST_DC=CONTEXT="tests" docker compose -f docker-compose.dev.yml
 
 # Build images for different contexts
@@ -57,10 +58,10 @@ stop-test-ci:
 # Cleanup
 
 run-cleanup:
-	make dev-detached ARGS="auth"
-	make dev-exec ARGS="auth ./wait-for.sh auth:9004"
-	make dev-exec ARGS="auth npm run cleanup"
-	make dev-stop
+	$(DEV_DC) up -d
+	$(DEV_DC) exec auth ./wait-for.sh auth:9004
+	$(DEV_DC) exec auth npm run cleanup
+	$(DEV_DC) down
 
 ########################## Deprecation List ##########################
 
diff --git a/dev/run-lint.sh b/dev/run-lint.sh
index bd7296b9..804f965a 100644
--- a/dev/run-lint.sh
+++ b/dev/run-lint.sh
@@ -39,10 +39,10 @@ then
     # Container Mode
     eval "$DC_AUTH npm run lint-check"
     eval "$DC_AUTH npm run prettify-check"
-    eval "$DC_PIP -T auth black --check --diff authlib/ tests/"
-    eval "$DC_PIP -T auth isort --check-only --diff authlib/ tests/"
-    eval "$DC_PIP -T auth flake8 authlib/ tests/"
-    eval "$DC_PIP -T auth mypy authlib/ tests/"
+    eval "$DC_PIP -T auth black --check --diff osauthlib/ tests/"
+    eval "$DC_PIP -T auth isort --check-only --diff osauthlib/ tests/"
+    eval "$DC_PIP -T auth flake8 osauthlib/ tests/"
+    eval "$DC_PIP -T auth mypy osauthlib/ tests/"
 else
     {
         cd ./auth || exit 1
@@ -52,9 +52,9 @@ else
         npm run prettify-check
 
         cd ./libraries/pip-auth || exit 1
-        black --check --diff authlib/ tests/
-        isort --check-only --diff authlib/ tests/
-        flake8 authlib/ tests/
-        mypy authlib/ tests/
+        black --check --diff osauthlib/ tests/
+        isort --check-only --diff osauthlib/ tests/
+        flake8 osauthlib/ tests/
+        mypy osauthlib/ tests/
     }
 fi