diff --git a/go.mod b/go.mod
index 2cf0bdd..0618afc 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,7 @@ module github.com/zarnoevic/go-rabbitmq
 
 go 1.22.0
 
-require github.com/rabbitmq/amqp091-go v1.9.0 // indirect
+require (
+	github.com/joho/godotenv v1.5.1 // indirect
+	github.com/rabbitmq/amqp091-go v1.9.0 // indirect
+)
diff --git a/go.sum b/go.sum
index 00c627d..3e3f640 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,7 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
diff --git a/src/cmd/client/main.go b/src/cmd/client/main.go
index dc15b36..0597c3e 100644
--- a/src/cmd/client/main.go
+++ b/src/cmd/client/main.go
@@ -2,21 +2,29 @@ package main
 
 import (
 	"fmt"
+	"log"
 	"os"
 
+	"github.com/joho/godotenv"
 	"github.com/zarnoevic/go-rabbitmq/src/pkg/services/producerService"
 )
 
 func main() {
+
+	if err := godotenv.Load(); err != nil {
+		log.Fatalf("Error loading .env file: %v", err)
+	}
+
 	rabbitMQUser := os.Getenv("RABBITMQ_USER")
 	rabbitMQPassword := os.Getenv("RABBITMQ_PASSWORD")
 	rabbitMQAMQPPort := os.Getenv("RABBITMQ_AMQP_PORT")
 	rabbitMQAMQPHost := os.Getenv("RABBITMQ_AMQP_HOST")
+	rabbitMQQueueName := os.Getenv("RABBITMQ_QUEUE_NAME")
 	commandsPath := os.Getenv("COMMANDS_PATH")
 
 	amqpURL := fmt.Sprintf("amqp://%s:%s@%s:%s/", rabbitMQUser, rabbitMQPassword, rabbitMQAMQPHost, rabbitMQAMQPPort)
 
-	err := producerService.ProcessCSV(commandsPath, amqpURL, "myQueue")
+	err := producerService.ProcessCSV(commandsPath, amqpURL, rabbitMQQueueName)
 	if err != nil {
 		fmt.Printf("Error processing CSV: %s\n", err)
 	}
diff --git a/src/cmd/server/main.go b/src/cmd/server/main.go
index a902248..11c9066 100644
--- a/src/cmd/server/main.go
+++ b/src/cmd/server/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"github.com/joho/godotenv"
 	"log"
 	"os"
 
@@ -11,15 +12,20 @@ import (
 )
 
 func main() {
+
+	if err := godotenv.Load(); err != nil {
+		log.Fatalf("Error loading .env file: %v", err)
+	}
+
 	rabbitMQUser := os.Getenv("RABBITMQ_USER")
 	rabbitMQPassword := os.Getenv("RABBITMQ_PASSWORD")
 	rabbitMQAMQPPort := os.Getenv("RABBITMQ_AMQP_PORT")
 	rabbitMQAMQPHost := os.Getenv("RABBITMQ_AMQP_HOST")
+	rabbitMQQueueName := os.Getenv("RABBITMQ_QUEUE_NAME")
 
 	amqpURL := fmt.Sprintf("amqp://%s:%s@%s:%s/", rabbitMQUser, rabbitMQPassword, rabbitMQAMQPHost, rabbitMQAMQPPort)
-	queueName := "yourQueueName"
 
-	client, err := rabbitClient.NewRabbitClient(amqpURL, queueName)
+	client, err := rabbitClient.NewRabbitClient(amqpURL, rabbitMQQueueName)
 	if err != nil {
 		log.Fatalf("Failed to create RabbitMQ client: %s", err)
 	}