diff --git a/metrics.go b/metrics.go
index 44fe33d..a303165 100644
--- a/metrics.go
+++ b/metrics.go
@@ -119,7 +119,7 @@ func metricsHandler(response http.ResponseWriter, request *http.Request) {
 			mystart = start[0]
 		}
 
-		url := "http://localhost:8086/api/v2/query?org=minibeieliorg"
+		url := getenv("INFLUX_URL", "http://localhost:8086/api/v2/query?org=minibeieliorg")
 		data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket") |> range(start: %s, stop: %s) |> filter(fn: (r) => r._measurement == "measurement") |> filter(fn: (r) => r._field == "%s") |> filter(fn: (r) => r.deveui == "%s")`, mystart, mystop, property[0], mydeveui))
 
 		req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
@@ -200,7 +200,7 @@ func lastmetricsHandler(response http.ResponseWriter, request *http.Request) {
 
 		log.Println("Url Param 'deveui' is: " + string(mydeveui))
 
-		url := "http://localhost:8086/api/v2/query?org=minibeieliorg"
+		url := getenv("INFLUX_URL", "http://localhost:8086/api/v2/query?org=minibeieliorg")
 		//data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket") |> range(start:-365d) |> filter(fn: (r) => r.deveui == "%s") |> filter(fn: (r) => r._field == "v" or r._field == "t") |> last() |> yield(name: "last")`,mydeveui))
 		data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket") 
                                          |> range(start:-365d) 
@@ -298,7 +298,7 @@ func CalcDaysUntil(mydate string) int {
 func getLastMetrics(deveui string) OneMetric {
 	var res OneMetric
 
-	url := "http://localhost:8086/api/v2/query?org=minibeieliorg"
+	url := getenv("INFLUX_URL", "http://localhost:8086/api/v2/query?org=minibeieliorg")
 	data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket") 
                                  |> range(start:-365d) 
                                  |> filter(fn: (r) => r._measurement == "measurement" and r.deveui == "%s")