diff --git a/scaletest/terraform/gcp_cluster.tf b/scaletest/terraform/gcp_cluster.tf
index 23633e45ba139..a1b12678749ee 100644
--- a/scaletest/terraform/gcp_cluster.tf
+++ b/scaletest/terraform/gcp_cluster.tf
@@ -22,6 +22,7 @@ resource "google_container_cluster" "primary" {
   }
   initial_node_count       = 1
   remove_default_node_pool = true
+
   network_policy {
     enabled = true
   }
@@ -45,6 +46,9 @@ resource "google_container_node_pool" "coder" {
   project    = var.project_id
   cluster    = google_container_cluster.primary.name
   node_count = var.state == "stopped" ? 0 : var.nodepool_size_coder
+  management {
+    auto_upgrade = false
+  }
   node_config {
     oauth_scopes = [
       "https://www.googleapis.com/auth/logging.write",
@@ -75,6 +79,9 @@ resource "google_container_node_pool" "workspaces" {
   project    = var.project_id
   cluster    = google_container_cluster.primary.name
   node_count = var.state == "stopped" ? 0 : var.nodepool_size_workspaces
+  management {
+    auto_upgrade = false
+  }
   node_config {
     oauth_scopes = [
       "https://www.googleapis.com/auth/logging.write",
@@ -105,6 +112,9 @@ resource "google_container_node_pool" "misc" {
   project    = var.project_id
   cluster    = google_container_cluster.primary.name
   node_count = var.state == "stopped" ? 0 : var.nodepool_size_misc
+  management {
+    auto_upgrade = false
+  }
   node_config {
     oauth_scopes = [
       "https://www.googleapis.com/auth/logging.write",
diff --git a/scaletest/terraform/prometheus.tf b/scaletest/terraform/prometheus.tf
index 9dd44a055275f..ade1289e38739 100644
--- a/scaletest/terraform/prometheus.tf
+++ b/scaletest/terraform/prometheus.tf
@@ -32,8 +32,9 @@ resource "null_resource" "prometheus_namespace" {
 
 # Create a secret to store the remote write key
 resource "kubernetes_secret" "prometheus-credentials" {
-  count = local.prometheus_remote_write_enabled ? 1 : 0
-  type  = "kubernetes.io/basic-auth"
+  count      = local.prometheus_remote_write_enabled ? 1 : 0
+  type       = "kubernetes.io/basic-auth"
+  depends_on = [null_resource.prometheus_namespace]
   metadata {
     name      = "prometheus-credentials"
     namespace = local.prometheus_namespace
@@ -165,7 +166,7 @@ resource "local_file" "coder-monitoring-manifest" {
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  namespace: ${local.prometheus_namespace}
+  namespace: ${local.coder_namespace}
   name: coder-monitoring
 spec:
   selector: