diff --git a/usecases/cs/lpc/usecase.go b/usecases/cs/lpc/usecase.go
index eaa26c0b..555341e5 100644
--- a/usecases/cs/lpc/usecase.go
+++ b/usecases/cs/lpc/usecase.go
@@ -43,13 +43,8 @@ var _ ucapi.CsLPCInterface = (*LPC)(nil)
 func NewLPC(localEntity spineapi.EntityLocalInterface, eventCB api.EntityEventCallback) *LPC {
 	validActorTypes := []model.UseCaseActorType{model.UseCaseActorTypeEnergyGuard}
 	validEntityTypes := []model.EntityTypeType{
+		model.EntityTypeTypeGridGuard,
 		model.EntityTypeTypeCEM,
-		model.EntityTypeTypeCompressor,
-		model.EntityTypeTypeEVSE,
-		model.EntityTypeTypeHeatPumpAppliance,
-		model.EntityTypeTypeInverter,
-		model.EntityTypeTypeSmartEnergyAppliance,
-		model.EntityTypeTypeSubMeterElectricity,
 	}
 	useCaseScenarios := []api.UseCaseScenario{
 		{
diff --git a/usecases/cs/lpp/usecase.go b/usecases/cs/lpp/usecase.go
index 6997eca5..9a2c7dc9 100644
--- a/usecases/cs/lpp/usecase.go
+++ b/usecases/cs/lpp/usecase.go
@@ -43,11 +43,8 @@ var _ ucapi.CsLPPInterface = (*LPP)(nil)
 func NewLPP(localEntity spineapi.EntityLocalInterface, eventCB api.EntityEventCallback) *LPP {
 	validActorTypes := []model.UseCaseActorType{model.UseCaseActorTypeEnergyGuard}
 	validEntityTypes := []model.EntityTypeType{
+		model.EntityTypeTypeGridGuard,
 		model.EntityTypeTypeCEM,
-		model.EntityTypeTypeEVSE,
-		model.EntityTypeTypeInverter,
-		model.EntityTypeTypeSmartEnergyAppliance,
-		model.EntityTypeTypeSubMeterElectricity,
 	}
 	useCaseScenarios := []api.UseCaseScenario{
 		{