diff --git a/docker-bake.hcl b/docker-bake.hcl
index 72eb9d9a..ef892fe0 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -53,7 +53,7 @@ group "erpnext" {
 }
 
 group "default" {
-    targets = ["frappe", "erpnext"]
+    targets = ["erpnext"]
 }
 
 function "tag" {
diff --git a/tests/conftest.py b/tests/conftest.py
index f9885dd1..4cc67726 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -65,19 +65,6 @@ def frappe_site(compose: Compose):
     yield site_name
 
 
-@pytest.fixture(scope="class")
-def erpnext_setup(compose: Compose):
-    compose.stop()
-
-    args = ["-f", "overrides/compose.erpnext.yaml"]
-    if CI:
-        args += ("-f", "tests/compose.ci-erpnext.yaml")
-    compose(*args, "up", "-d", "--quiet-pull")
-
-    yield
-    compose.stop()
-
-
 @pytest.fixture(scope="class")
 def erpnext_site(compose: Compose):
     site_name = "test_erpnext_site"
diff --git a/tests/utils.py b/tests/utils.py
index fc12198b..f42aa891 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -28,6 +28,8 @@ class Compose:
             "-f",
             "compose.yaml",
             "-f",
+            "overrides/compose.erpnext.yaml",
+            "-f",
             "overrides/compose.proxy.yaml",
             "-f",
             "overrides/compose.mariadb.yaml",