diff --git a/build.go b/build.go
index 69f09865b02ab3f720673227e6d47fa0f557c9b0..5cf8a5655cd546a2438e0af9727e2ed70ede0f42 100644
--- a/build.go
+++ b/build.go
@@ -36,7 +36,7 @@ func buildImage(d Deployment, dockerClient *client.Client) error {
 	labels := prometheus.Labels{"type": spb.Type_CONTAINERISED.String()}
 	start := promStartHook(labels, buildsTotal)
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*120)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*300)
 	defer cancel()
 
 	p := filepath.Join(d.ID.String(), "/")
diff --git a/docker-compose.yml b/docker-compose.yml
index 9b5b1095b815b96101a804f73a30d5a3870eb416..c8698002dffe238b02b2303e495b40b3948f94a5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,4 +46,4 @@ volumes:
   grafana-data:
 
 networks:
-  csbi-dev-net:
\ No newline at end of file
+  csbi-dev-net:
diff --git a/metrics.go b/metrics.go
index fb0c90834fb10a5c452fa46e3f56ffacc4bbfaeb..2c1c20bbf2ae35fbf1b5541eac95ffeb72de713d 100644
--- a/metrics.go
+++ b/metrics.go
@@ -98,7 +98,7 @@ var (
 			Name: "orchestrator_creations_total",
 			Help: "Total number of created deployments",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	orchestratorDestructionsTotal = promauto.NewCounterVec(
@@ -106,7 +106,7 @@ var (
 			Name: "orchestrator_destructions_total",
 			Help: "Total number of destroyed deployments",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	orchestratorErrorsTotal = promauto.NewCounterVec(
@@ -114,7 +114,7 @@ var (
 			Name: "orchestrator_errors_total",
 			Help: "Total number of orchestrator errors",
 		},
-		[]string{"type", "name", "error"},
+		[]string{"type", "error"},
 	)
 
 	orchestratorCreateDurationSeconds = promauto.NewHistogramVec(
@@ -122,7 +122,7 @@ var (
 			Name: "orchestrator_create_duration_seconds",
 			Help: "Histogram of create operation duration",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	orchestratorCreateDurationSecondsTotal = promauto.NewCounterVec(
@@ -130,7 +130,7 @@ var (
 			Name: "orchestrator_create_duration_seconds_total",
 			Help: "Total time required for create operations",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	orchestratorDestroyDurationSeconds = promauto.NewHistogramVec(
@@ -138,7 +138,7 @@ var (
 			Name: "orchestrator_destroy_duration_seconds",
 			Help: "Histogram of destroy operation duration",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	orchestratorDestroyDurationSecondsTotal = promauto.NewCounterVec(
@@ -146,7 +146,7 @@ var (
 			Name: "orchestrator_destroy_duration_seconds_total",
 			Help: "Total time required for destroy operations",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	codeGenerationErrorsTotal = promauto.NewCounterVec(
diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml
index 042b85317dcb4703eee11b8bbe0a8f4e520a97be..cb61f192d8b60c852140d8662331ba4af97ecc19 100644
--- a/prometheus/prometheus.yml
+++ b/prometheus/prometheus.yml
@@ -1,6 +1,6 @@
 global:
   scrape_interval: 5s
-  scrape_timeout: 10s
+  scrape_timeout: 3s
 
 rule_files:
   - alert.yml