diff --git a/selfprivacy_api/graphql/common_types/service.py b/selfprivacy_api/graphql/common_types/service.py
index fc13974..c9cf50e 100644
--- a/selfprivacy_api/graphql/common_types/service.py
+++ b/selfprivacy_api/graphql/common_types/service.py
@@ -4,15 +4,21 @@ import strawberry
 from selfprivacy_api.graphql.common_types.dns import DnsRecord
 
 from selfprivacy_api.graphql.common_types.storage_usage import (
-    ServiceStorageUsage,
+    StorageUsageInterface,
     StorageVolume,
 )
-from selfprivacy_api.graphql.queries.services import get_volume_by_id
 from selfprivacy_api.services import get_service_by_id, get_services_by_location
 from selfprivacy_api.services import Service as ServiceInterface
 from selfprivacy_api.utils.block_devices import BlockDevices
 
 
+@strawberry.type
+class ServiceStorageUsage(StorageUsageInterface):
+    """Storage usage for a service"""
+
+    service: typing.Optional["Service"]
+
+
 @strawberry.enum
 class ServiceStatusEnum(Enum):
     RUNNING = "RUNNING"
diff --git a/selfprivacy_api/graphql/common_types/storage_usage.py b/selfprivacy_api/graphql/common_types/storage_usage.py
index cdff53f..f45966e 100644
--- a/selfprivacy_api/graphql/common_types/storage_usage.py
+++ b/selfprivacy_api/graphql/common_types/storage_usage.py
@@ -1,8 +1,6 @@
 import typing
 import strawberry
 
-from selfprivacy_api.graphql.common_types.service import Service
-
 
 @strawberry.type
 class StorageVolume:
@@ -24,10 +22,3 @@ class StorageUsageInterface:
     used_space: str
     volume: typing.Optional[StorageVolume]
     title: str
-
-
-@strawberry.type
-class ServiceStorageUsage(StorageUsageInterface):
-    """Storage usage for a service"""
-
-    service: typing.Optional["Service"]
diff --git a/selfprivacy_api/graphql/queries/storage.py b/selfprivacy_api/graphql/queries/storage.py
index 12071ce..73b9a8d 100644
--- a/selfprivacy_api/graphql/queries/storage.py
+++ b/selfprivacy_api/graphql/queries/storage.py
@@ -3,11 +3,11 @@
 import typing
 import strawberry
 from selfprivacy_api.graphql.common_types.service import (
+    ServiceStorageUsage,
     service_to_graphql_service,
     get_volume_by_id,
 )
 from selfprivacy_api.graphql.common_types.storage_usage import (
-    ServiceStorageUsage,
     StorageVolume,
 )
 from selfprivacy_api.services import get_services_by_location