diff --git a/backend/Dockerfile b/backend/Dockerfile
index 20fd55f2c..2f3bd6e4e 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -41,6 +41,7 @@ ENV TZ=UTC \
     GROUP_DB=db \
     GROUP_ENDER=ender \
     GROUP_CACHE=cache \
+    GROUP_HEURISTICS=heuristics \
     AWS_REGION_WEB=eu-central-1 \
     AWS_REGION_IOS=eu-west-1 \
     AWS_REGION_ASSETS=eu-central-1 \
diff --git a/backend/cmd/heuristics/main.go b/backend/cmd/heuristics/main.go
index 6edf01a92..d163c26c4 100644
--- a/backend/cmd/heuristics/main.go
+++ b/backend/cmd/heuristics/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 	"openreplay/backend/internal/builder"
-	"openreplay/backend/internal/config/ender"
+	"openreplay/backend/internal/config/heuristics"
 	"openreplay/backend/internal/handlers"
 	"openreplay/backend/internal/handlers/custom"
 	"openreplay/backend/internal/handlers/ios"
@@ -23,7 +23,7 @@ func main() {
 	log.SetFlags(log.LstdFlags | log.LUTC | log.Llongfile)
 
 	// Load service configuration
-	cfg := ender.New()
+	cfg := heuristics.New()
 
 	// HandlersFabric returns the list of message handlers we want to be applied to each incoming message.
 	handlersFabric := func() []handlers.MessageProcessor {
@@ -53,7 +53,7 @@ func main() {
 	// Init producer and consumer for data bus
 	producer := queue.NewProducer()
 	consumer := queue.NewMessageConsumer(
-		cfg.GroupEvents,
+		cfg.GroupHeuristics,
 		[]string{
 			cfg.TopicRawWeb,
 			cfg.TopicRawIOS,
diff --git a/backend/internal/config/ender/config.go b/backend/internal/config/ender/config.go
index e39fbc240..81457ad0e 100644
--- a/backend/internal/config/ender/config.go
+++ b/backend/internal/config/ender/config.go
@@ -5,7 +5,7 @@ import (
 )
 
 type Config struct {
-	GroupEvents     string
+	GroupEnder      string
 	TopicTrigger    string
 	LoggerTimeout   int
 	TopicRawWeb     string
@@ -15,7 +15,7 @@ type Config struct {
 
 func New() *Config {
 	return &Config{
-		GroupEvents:     env.String("GROUP_ENDER"),
+		GroupEnder:      env.String("GROUP_ENDER"),
 		TopicTrigger:    env.String("TOPIC_TRIGGER"),
 		LoggerTimeout:   env.Int("LOG_QUEUE_STATS_INTERVAL_SEC"),
 		TopicRawWeb:     env.String("TOPIC_RAW_WEB"),