diff --git a/internal/pkg/infrastructure/rabbitmq/rabbitmq.go b/internal/pkg/infrastructure/rabbitmq/rabbitmq.go
index 447c0ef..f73fa2c 100644
--- a/internal/pkg/infrastructure/rabbitmq/rabbitmq.go
+++ b/internal/pkg/infrastructure/rabbitmq/rabbitmq.go
@@ -31,10 +31,25 @@ type RabbitMQClient struct {
 type MessageHandler func([]byte) error
 
 func NewRabbitMQClient() (*RabbitMQClient, error) {
-	// Get RabbitMQ URL from environment or use default
 	rabbitmqURL := os.Getenv("RABBITMQ_URL")
 	if rabbitmqURL == "" {
-		rabbitmqURL = "amqp://guest:guest@localhost:5672/"
+		host := os.Getenv("RABBITMQ_HOST")
+		if host == "" {
+			host = "localhost"
+		}
+		port := os.Getenv("RABBITMQ_PORT")
+		if port == "" {
+			port = "5672"
+		}
+		user := os.Getenv("RABBITMQ_USER")
+		if user == "" {
+			user = "guest"
+		}
+		password := os.Getenv("RABBITMQ_PASSWORD")
+		if password == "" {
+			password = "guest"
+		}
+		rabbitmqURL = fmt.Sprintf("amqp://%s:%s@%s:%s/", user, password, host, port)
 	}
 
 	// Connect to RabbitMQ with retry logic