diff --git a/terraform/testnet/testnet/templates/monitoring.yaml b/terraform/testnet/testnet/templates/monitoring.yaml
index f3f713945d1ce..04d503f385883 100644
--- a/terraform/testnet/testnet/templates/monitoring.yaml
+++ b/terraform/testnet/testnet/templates/monitoring.yaml
@@ -13,6 +13,16 @@ data:
         isDefault: true
         access: proxy
         url: http://localhost:9090
+      {{- range .Values.monitoring.grafana.datasources }}
+      - name: {{ .name }}
+        {{- range $k, $v := .config }}
+        {{ $k }}: {{ toYaml $v }}
+        {{- end }}
+        {{- if .jsonData }}
+        jsonData:
+          {{ toYaml .jsonData | nindent 10 }}
+        {{- end }}
+      {{- end }}
 
   dashboards.yml: |-
     apiVersion: 1
@@ -230,6 +240,9 @@ spec:
       - name: grafana
         image: {{ .grafana.image.repo }}:{{ .grafana.image.tag }}
         imagePullPolicy: {{ .grafana.image.pullPolicy }}
+        env:
+        - name: GF_AUTH_SIGV4_AUTH_ENABLED
+          value: "true"
         command: ["/bin/sh", "-c"]
         args: ["cp /dashboards/* /etc/grafana/dashboards/aptos && gunzip -f /etc/grafana/dashboards/aptos/*.json.gz && exec /run.sh"]
         resources:
diff --git a/terraform/testnet/testnet/values.yaml b/terraform/testnet/testnet/values.yaml
index 2060e2973a832..468e7b9eb081e 100644
--- a/terraform/testnet/testnet/values.yaml
+++ b/terraform/testnet/testnet/values.yaml
@@ -145,6 +145,7 @@ monitoring:
         memory: 128Mi
     googleAuth:
     config:
+    datasources: []
 
 # if enabled, faucet_test is synchronized with cluster_test traffic
 # to prevent race on mint account