diff --git a/buildQiot.sh b/buildQiot.sh
old mode 100644
new mode 100755
index b46fb96..ab8a020
--- a/buildQiot.sh
+++ b/buildQiot.sh
@@ -4,14 +4,14 @@ cd /home/abattagl/git/qiot/datahub/qiot-datahub-storer/qiot-datahub-storer-pollu
 ./build.sh
 cd /home/abattagl/git/qiot/datahub/qiot-datahub-aggregation/
 ./build.sh
-cd /home/abattagl/git/qiot/datahub/qiot-datahub-importer/
-./build.sh
+#cd /home/abattagl/git/qiot/datahub/qiot-datahub-importer/
+#./build.sh
 cd /home/abattagl/git/qiot/datahub/qiot-datahub-registration/
 ./build.sh
 cd /home/abattagl/git/qiot/datahub/qiot-datahub-endpoint/qiot-datahub-endpoint-mqtt/
 ./build.sh
-cd /home/abattagl/git/qiot/edge/qiot-sensors-emulator/
-./build.sh
-cd /home/abattagl/git/qiot/edge/qiot-service/
-./build.sh
+#cd /home/abattagl/git/qiot/edge/qiot-sensors-emulator/
+#./build.sh
+#cd /home/abattagl/git/qiot/edge/qiot-service/
+#./build.sh
 
diff --git a/datahub/docker-compose.yaml b/datahub/docker-compose.yaml
index e0ac921..e873b24 100644
--- a/datahub/docker-compose.yaml
+++ b/datahub/docker-compose.yaml
@@ -1,11 +1,5 @@
 version: '3'
 services:
-  edge-sensors:
-    image: quay.io/qiot/qiot-sensors-emulator
-    container_name: "edge-sensors"
-    restart: "no"
-    ports:
-      - "5000:5000"
   datahub-registration:
     image: quay.io/qiot/qiot-datahub-registration
     container_name: "datahub-registration"
@@ -13,6 +7,7 @@ services:
     ports:
       - "5016:5016"
     environment:
+      QUARKUS_PROFILE: "staging"
       HTTPPORT: "5016"
       MONGODBURL: "mongo:27017"
   datahub-aggregation:
@@ -22,13 +17,25 @@ services:
     ports:
       - "5018:5018"
     environment:
+      QUARKUS_PROFILE: "staging"
       HTTPPORT: "5018"
       MONGODBURL: "mongo:27017"
+  datahub-query:
+    image: quay.io/qiot/qiot-datahub-query
+    container_name: "datahub-query"
+    restart: "no"
+    ports:
+      - "5200:5200"
+    environment:
+      QUARKUS_PROFILE: "staging"
+      HTTPPORT: "5200"
+      MONGODBURL: "mongo:27017"
   endpoint-mqtt:
     image: quay.io/qiot/qiot-datahub-endpoint-mqtt
     container_name: "datahub-endpoint-mqtt"
     restart: "no"
     environment:
+      QUARKUS_PROFILE: "staging"
       AMQPHOST: "activemq"
       MQTTHOST: "activemq"
 #  gasstreamer:
@@ -50,6 +57,7 @@ services:
     container_name: "datahub-storer-gas"
     restart: "no"
     environment:
+      QUARKUS_PROFILE: "staging"
       KAFKABOOTSTRAPURL: "kafka:9092"
       MONGODBURL: "mongo:27017"
   pollutionstorer:
@@ -57,6 +65,7 @@ services:
     container_name: "datahub-storer-pollution"
     restart: "no"
     environment:
+      QUARKUS_PROFILE: "staging"
       KAFKABOOTSTRAPURL: "kafka:9092"
       MONGODBURL: "mongo:27017"
 networks:
diff --git a/edge/docker-compose.yaml b/edge/docker-compose.yaml
index 89d21e1..efe0b29 100644
--- a/edge/docker-compose.yaml
+++ b/edge/docker-compose.yaml
@@ -7,14 +7,15 @@ services:
     ports:
       - "8091:8080"
     environment:
+      QUARKUS_PROFILE: "staging"
       STATIONSERIAL: "teststationserial01"
       STATIONNAME: "teststation01"
       STATIONADDRESS: "viale john fitzgerald kennedy 2/D vibo valentia"
       SENSORSURL: "http://edge-sensors:5000/"
-      #DATAHUBURL: "http://datahub-registration:5016/"
-      #MQTTHOST: "activemq"
-      #ENABLESSL: "false"
-      #MQTTPORT: "1883"
+      DATAHUBURL: "http://datahub-registration:5016/"
+      MQTTURL: "activemq"
+      ENABLESSL: "false"
+      MQTTPORT: "1883"
   edge-service-02:
     image: quay.io/qiot/qiot-service
     container_name: "edge-service-02"
@@ -22,14 +23,15 @@ services:
     ports:
       - "8092:8080"
     environment:
+      QUARKUS_PROFILE: "staging"
       STATIONSERIAL: "teststationserial02"
       STATIONNAME: "teststation02"
       STATIONADDRESS: "soriano calabro"
       SENSORSURL: "http://edge-sensors:5000/"
-      #DATAHUBURL: "http://datahub-registration:5016/"
-      #MQTTHOST: "activemq"
-      #ENABLESSL: "false"
-      #MQTTPORT: "1883"
+      DATAHUBURL: "http://datahub-registration:5016/"
+      MQTTURL: "activemq"
+      ENABLESSL: "false"
+      MQTTPORT: "1883"
   edge-service-03:
     image: quay.io/qiot/qiot-service
     container_name: "edge-service-03"
@@ -37,14 +39,15 @@ services:
     ports:
       - "8093:8080"
     environment:
+      QUARKUS_PROFILE: "staging"
       STATIONSERIAL: "teststationserial03"
       STATIONNAME: "teststation03"
       STATIONADDRESS: "minsk"
       SENSORSURL: "http://edge-sensors:5000/"
-      #DATAHUBURL: "http://datahub-registration:5016/"
-      #MQTTHOST: "activemq"
-      #ENABLESSL: "false"
-      #MQTTPORT: "1883"
+      DATAHUBURL: "http://datahub-registration:5016/"
+      MQTTURL: "activemq"
+      ENABLESSL: "false"
+      MQTTPORT: "1883"
 networks:
   default:
     external:
diff --git a/edge/prod/docker-compose.yaml b/edge/prod/docker-compose.yaml
new file mode 100644
index 0000000..89d21e1
--- /dev/null
+++ b/edge/prod/docker-compose.yaml
@@ -0,0 +1,51 @@
+version: '3'
+services:
+  edge-service-01:
+    image: quay.io/qiot/qiot-service
+    container_name: "edge-service-01"
+    restart: "no"
+    ports:
+      - "8091:8080"
+    environment:
+      STATIONSERIAL: "teststationserial01"
+      STATIONNAME: "teststation01"
+      STATIONADDRESS: "viale john fitzgerald kennedy 2/D vibo valentia"
+      SENSORSURL: "http://edge-sensors:5000/"
+      #DATAHUBURL: "http://datahub-registration:5016/"
+      #MQTTHOST: "activemq"
+      #ENABLESSL: "false"
+      #MQTTPORT: "1883"
+  edge-service-02:
+    image: quay.io/qiot/qiot-service
+    container_name: "edge-service-02"
+    restart: "no"
+    ports:
+      - "8092:8080"
+    environment:
+      STATIONSERIAL: "teststationserial02"
+      STATIONNAME: "teststation02"
+      STATIONADDRESS: "soriano calabro"
+      SENSORSURL: "http://edge-sensors:5000/"
+      #DATAHUBURL: "http://datahub-registration:5016/"
+      #MQTTHOST: "activemq"
+      #ENABLESSL: "false"
+      #MQTTPORT: "1883"
+  edge-service-03:
+    image: quay.io/qiot/qiot-service
+    container_name: "edge-service-03"
+    restart: "no"
+    ports:
+      - "8093:8080"
+    environment:
+      STATIONSERIAL: "teststationserial03"
+      STATIONNAME: "teststation03"
+      STATIONADDRESS: "minsk"
+      SENSORSURL: "http://edge-sensors:5000/"
+      #DATAHUBURL: "http://datahub-registration:5016/"
+      #MQTTHOST: "activemq"
+      #ENABLESSL: "false"
+      #MQTTPORT: "1883"
+networks:
+  default:
+    external:
+      name: qiot
\ No newline at end of file
diff --git a/sensor/docker-compose.yaml b/sensor/docker-compose.yaml
new file mode 100644
index 0000000..da97711
--- /dev/null
+++ b/sensor/docker-compose.yaml
@@ -0,0 +1,14 @@
+version: '3'
+services:
+  edge-sensors:
+    image: quay.io/qiot/qiot-sensors-emulator
+    container_name: "edge-sensors"
+    restart: "no"
+    ports:
+      - "5000:5000"
+    environment:
+      QUARKUS_PROFILE: "staging"
+networks:
+  default:
+    external:
+      name: qiot
\ No newline at end of file