diff --git a/Makefile b/Makefile
index 5821495c7dd708ebe49b899509931038d196baea..69872af46dce7458628f073e307d003ebbb593f5 100644
--- a/Makefile
+++ b/Makefile
@@ -61,3 +61,8 @@ develop:
 
 	@go run cmd/query-service/main.go
 
+docker:
+	make linux
+	@docker build -t query-service:latest .
+	@docker tag query-service:latest datastropheregistry.azurecr.io/query-service\:latest
+	@docker push datastropheregistry.azurecr.io/query-service\:latest
\ No newline at end of file
diff --git a/deployments/deployment.yml b/deployments/deployment.yml
index e5d2106e25dd7943c9f75be7cd59176898e09ce4..39d666a35a604a03a10ae98a594b13b2e40d5460 100644
--- a/deployments/deployment.yml
+++ b/deployments/deployment.yml
@@ -38,5 +38,9 @@ spec:
           value: redis.redis.svc.cluster.local:6379
         - name: LOG_MESSAGES
           value: "true"
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
       imagePullSecrets:
       - name: docker-regcred
\ No newline at end of file
diff --git a/internal/drivers/brokerdriver/broker.go b/internal/drivers/brokerdriver/broker.go
index abef043fe84c928879f35fe62903eeee52ba36a2..aa71621f5a7d28f12d410fc4e5771531881c339d 100644
--- a/internal/drivers/brokerdriver/broker.go
+++ b/internal/drivers/brokerdriver/broker.go
@@ -37,8 +37,8 @@ func CreateAliceBroker(gateway brokeradapter.GatewayInterface) *Driver {
 
 // CreateConsumer creates an AliceConsumer on a certain exchange and queue
 func (d *Driver) CreateConsumer() Consumer {
-	exchangeID := "query-requests"
-	routingKey := "aql-user-request"
+	exchangeID := "requests-exchange"
+	routingKey := "aql-query-request"
 
 	// Declare the exchange we want to bind to
 	exchange, err := alice.CreateDefaultExchange(exchangeID, alice.Direct)
diff --git a/internal/usecases/consume/consume.go b/internal/usecases/consume/consume.go
index a2426fe427b3a2e2f221da4c753d2051f29c8863..5555fddf26716d1ef65bf2503fb094d237dd0d88 100644
--- a/internal/usecases/consume/consume.go
+++ b/internal/usecases/consume/consume.go
@@ -1,6 +1,7 @@
 package consume
 
 import (
+	"os"
 	"query-service/internal/drivers/brokerdriver"
 	"query-service/internal/usecases/convertquery"
 	"query-service/internal/usecases/produce"
@@ -26,8 +27,13 @@ func NewService(broker brokerdriver.Broker, produceService produce.UseCase, conv
 	}
 }
 
+var podName string
+
 // Start starts consuming
 func (s *Service) Start() {
+
+	podName = os.Getenv("POD_NAME")
+
 	// Create consumer
 	consumer := s.broker.CreateConsumer()
 
diff --git a/internal/usecases/consume/handlemessage.go b/internal/usecases/consume/handlemessage.go
index ba9787b8356b44f4e2cf5b14896c96771362afd3..a9658d218481ad17c65b0790c19d2c8d443d7fad 100644
--- a/internal/usecases/consume/handlemessage.go
+++ b/internal/usecases/consume/handlemessage.go
@@ -37,6 +37,7 @@ func (s *Service) HandleMessage(msg *brokeradapter.Message) {
 	// Add type indicator to result from database
 	querymap := make(map[string]interface{})
 	querymap["type"] = "query_result"
+	querymap["pod"] = podName
 	querymap["values"] = *result
 	querybyte, err := json.Marshal(querymap)
 	//fmt.Println(querymap)