diff --git a/docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md b/docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
index 1c5269772b..ac96595f32 100644
--- a/docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
+++ b/docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
@@ -116,12 +116,13 @@ prometheus.exporter.cloudwatch "queues" {
 You can use the following arguments with `prometheus.exporter.cloudwatch`:
 
 | Name                      | Type                | Description                                                                    | Default | Required |
-|---------------------------|---------------------|--------------------------------------------------------------------------------|---------|----------|
+| ------------------------- | ------------------- | ------------------------------------------------------------------------------ | ------- | -------- |
 | `sts_region`              | `string`            | AWS region to use when calling [STS][] for retrieving account information.     |         | yes      |
 | `aws_sdk_version_v2`      | `bool`              | Use AWS SDK version 2.                                                         | `false` | no       |
 | `fips_disabled`           | `bool`              | Disable use of FIPS endpoints. Set 'true' when running outside of USA regions. | `true`  | no       |
 | `debug`                   | `bool`              | Enable debug logging on CloudWatch exporter internals.                         | `false` | no       |
 | `discovery_exported_tags` | `map(list(string))` | List of tags (value) per service (key) to export in all metrics.               | `{}`    | no       |
+| `labels_to_snake_case`    | `bool`              | Convert label names to snake_case.                                             | `false` | no       |
 
 If you define the `["name", "type"]` under `"AWS/EC2"` in the `discovery_exported_tags` argument, it exports the name and type tags and its values as labels in all metrics.
 This affects all discovery jobs.
@@ -133,7 +134,7 @@ This affects all discovery jobs.
 You can use the following blocks with `prometheus.exporter.cloudwatch`:
 
 | Name                                       | Description                                                                                                                                                | Required |
-|--------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
+| ------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- |
 | [`discovery`][discovery]                   | Configures a discovery job. You can configure multiple jobs.                                                                                               | no\*     |
 | `discovery` > [`role`][role]               | Configures the IAM roles the job should assume to scrape metrics. Defaults to the role configured in the environment {{< param "PRODUCT_NAME" >}} runs on. | no       |
 | `discovery` > [`metric`][metric]           | Configures the list of metrics the job should scrape. You can define multiple metrics inside one job.                                                      | yes      |
@@ -191,15 +192,18 @@ prometheus.exporter.cloudwatch "discover_instances" {
 You can configure the `discovery` block one or multiple times to scrape metrics from different services or with different `search_tags`.
 
 | Name                          | Type           | Description                                                                                                                                                                                                                                            | Default | Required |
-|-------------------------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|----------|
+| ----------------------------- | -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- | -------- |
 | `regions`                     | `list(string)` | List of AWS regions.                                                                                                                                                                                                                                   |         | yes      |
 | `type`                        | `string`       | CloudWatch service alias (`"alb"`, `"ec2"`, etc) or namespace name (`"AWS/EC2"`, `"AWS/S3"`, etc). Refer to [supported-services][] for a complete list.                                                                                                |         | yes      |
 | `custom_tags`                 | `map(string)`  | Custom tags to be added as a list of key / value pairs. When exported to Prometheus format, the label name follows the following format: `custom_tag_{key}`.                                                                                           | `{}`    | no       |
 | `dimension_name_requirements` | `list(string)` | List of metric dimensions to query. Before querying metric values, the total list of metrics are filtered to only those that contain exactly this list of dimensions. An empty or undefined list results in all dimension combinations being included. | `{}`    | no       |
-| `delay`                       | `duration`     | Delay the start time of the CloudWatch metrics query by this duration.                                                                                                                                         | `0`     | no       |
+| `delay`                       | `duration`     | Delay the start time of the CloudWatch metrics query by this duration.                                                                                                                                                                                 | `0`     | no       |
+| `period`                      | `duration`     | Default period for metrics in this job.                                                                                                                                                                                                                | `5m`    | no       |
+| `length`                      | `duration`     | Default length for metrics in this job.                                                                                                                                                                                                                | `5m`    | no       |
 | `nil_to_zero`                 | `bool`         | When `true`, `NaN` metric values are converted to 0. Individual metrics can override this value in the [metric][] block.                                                                                                                               | `true`  | no       |
 | `recently_active_only`        | `bool`         | Only return metrics that have been active in the last 3 hours.                                                                                                                                                                                         | `false` | no       |
 | `search_tags`                 | `map(string)`  | List of key / value pairs to use for tag filtering (all must match). The value can be a regular expression.                                                                                                                                            | `{}`    | no       |
+| `add_cloudwatch_timestamp`    | `bool`         | When `true`, use the timestamp from CloudWatch instead of the scrape time.                                                                                                                                      | `false` | no       |
 
 [supported-services]: #supported-services-in-discovery-jobs
 
@@ -248,7 +252,7 @@ static "<LABEL>" {
 You can configure the `static` block one or multiple times to scrape metrics with different sets of `dimensions`.
 
 | Name          | Type           | Description                                                                                                                                                  | Default | Required |
-|---------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|----------|
+| ------------- | -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- | -------- |
 | `dimensions`  | `map(string)`  | CloudWatch metric dimensions as a list of name / value pairs. Must uniquely define all metrics in this job.                                                  |         | yes      |
 | `namespace`   | `string`       | CloudWatch metric namespace.                                                                                                                                 |         | yes      |
 | `regions`     | `list(string)` | List of AWS regions.                                                                                                                                         |         | yes      |
@@ -290,14 +294,17 @@ prometheus.exporter.cloudwatch "discover_instances" {
 You can configure the `custom_namespace` block multiple times to scrape metrics from different namespaces.
 
 | Name                          | Type           | Description                                                                                                                                                                                                                                            | Default | Required |
-|-------------------------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|----------|
+| ----------------------------- | -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- | -------- |
 | `namespace`                   | `string`       | CloudWatch metric namespace.                                                                                                                                                                                                                           |         | yes      |
 | `regions`                     | `list(string)` | List of AWS regions.                                                                                                                                                                                                                                   |         | yes      |
 | `custom_tags`                 | `map(string)`  | Custom tags to be added as a list of key / value pairs. When exported to Prometheus format, the label name follows the following format: `custom_tag_{key}`.                                                                                           | `{}`    | no       |
-| `delay`                       | `duration`     | Delay the start time of the CloudWatch metrics query by this duration.                                                                                                                                         | `0`     | no       |
+| `delay`                       | `duration`     | Delay the start time of the CloudWatch metrics query by this duration.                                                                                                                                                                                 | `0`     | no       |
+| `period`                      | `duration`     | Default period for metrics in this job.                                                                                                                                                                                                                | `5m`    | no       |
+| `length`                      | `duration`     | Default length for metrics in this job.                                                                                                                                                                                                                | `5m`    | no       |
 | `dimension_name_requirements` | `list(string)` | List of metric dimensions to query. Before querying metric values, the total list of metrics are filtered to only those that contain exactly this list of dimensions. An empty or undefined list results in all dimension combinations being included. | `{}`    | no       |
 | `nil_to_zero`                 | `bool`         | When `true`, `NaN` metric values are converted to 0. Individual metrics can override this value in the [metric][] block.                                                                                                                               | `true`  | no       |
 | `recently_active_only`        | `bool`         | Only return metrics that have been active in the last 3 hours.                                                                                                                                                                                         | `false` | no       |
+| `add_cloudwatch_timestamp`    | `bool`         | When `true`, use the timestamp from CloudWatch instead of the scrape time.                                                                                                                                      | `false` | no       |
 
 ### `metric`
 
@@ -309,12 +316,12 @@ The `metric` block may be specified multiple times to define multiple target met
 Refer to the [View available metrics](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/viewing_metrics_with_cloudwatch.html) topic in the Amazon CloudWatch documentation for detailed metrics information.
 
 | Name                       | Type           | Description                                                                | Default                                                                                                            | Required |
-|----------------------------|----------------|----------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------|----------|
+| -------------------------- | -------------- | -------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ | -------- |
 | `name`                     | `string`       | Metric name.                                                               |                                                                                                                    | yes      |
-| `period`                   | `duration`     | Refer to the [period][] section below.                                     |                                                                                                                    | yes      |
+| `period`                   | `duration`     | Refer to the [period][] section below.                                     | The value of `period` in the parent job.                                                                           | no       |
 | `statistics`               | `list(string)` | List of statistics to scrape. For example, `"Minimum"`, `"Maximum"`, etc.  |                                                                                                                    | yes      |
 | `add_cloudwatch_timestamp` | `bool`         | When `true`, use the timestamp from CloudWatch instead of the scrape time. | `false`                                                                                                            | no       |
-| `length`                   | `duration`     | Refer to the [period][] section below.                                     | Calculated based on `period`. Refer to [period][] for details.                                                     | no       |
+| `length`                   | `duration`     | Refer to the [period][] section below.                                     | The value of `length` in the parent job.                                                                           | no       |
 | `nil_to_zero`              | `bool`         | When `true`, `NaN` metric values are converted to 0.                       | The value of `nil_to_zero` in the parent [static][] or [discovery][] block. `true` if not set in the parent block. | no       |
 
 [period]: #period-and-length
@@ -353,7 +360,7 @@ Therefore, the credentials configured in the system need permission to assume th
 Refer to [Granting a user permissions to switch roles](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_permissions-to-switch.html) in the AWS IAM documentation for more information about how to configure this.
 
 | Name          | Type     | Description                                                                                                    | Default | Required |
-|---------------|----------|----------------------------------------------------------------------------------------------------------------|---------|----------|
+| ------------- | -------- | -------------------------------------------------------------------------------------------------------------- | ------- | -------- |
 | `external_id` | `string` | External ID used when calling STS AssumeRole API. Refer to the [IAM User Guide][details] for more information. | `""`    | no       |
 | `role_arn`    | `string` | AWS IAM Role ARN the exporter should assume to perform AWS API calls.                                          |         | yes      |
 
@@ -368,7 +375,7 @@ The decoupled scraping feature reduces the number of API requests sent to AWS.
 This feature also prevents component scrape timeouts when you gather high volumes of CloudWatch metrics.
 
 | Name              | Type     | Description                                                             | Default | Required |
-|-------------------|----------|-------------------------------------------------------------------------|---------|----------|
+| ----------------- | -------- | ----------------------------------------------------------------------- | ------- | -------- |
 | `enabled`         | `bool`   | Controls whether the decoupled scraping featured is enabled             | false   | no       |
 | `scrape_interval` | `string` | Controls how frequently to asynchronously gather new CloudWatch metrics | 5m      | no       |
 
diff --git a/internal/component/prometheus/exporter/cloudwatch/cloudwatch.go b/internal/component/prometheus/exporter/cloudwatch/cloudwatch.go
index c6d3a76438..51f199457d 100644
--- a/internal/component/prometheus/exporter/cloudwatch/cloudwatch.go
+++ b/internal/component/prometheus/exporter/cloudwatch/cloudwatch.go
@@ -31,10 +31,10 @@ func createExporter(opts component.Options, args component.Arguments) (integrati
 	fipsEnabled := !a.FIPSDisabled
 
 	if a.DecoupledScrape.Enabled {
-		exp, err := cloudwatch_exporter.NewDecoupledCloudwatchExporter(opts.ID, opts.Logger, exporterConfig, a.DecoupledScrape.ScrapeInterval, fipsEnabled, a.Debug, a.UseAWSSDKVersion2)
+		exp, err := cloudwatch_exporter.NewDecoupledCloudwatchExporter(opts.ID, opts.Logger, exporterConfig, a.DecoupledScrape.ScrapeInterval, fipsEnabled, a.LabelsSnakeCase, a.Debug, a.UseAWSSDKVersion2)
 		return exp, getHash(a), err
 	}
 
-	exp, err := cloudwatch_exporter.NewCloudwatchExporter(opts.ID, opts.Logger, exporterConfig, fipsEnabled, a.Debug, a.UseAWSSDKVersion2)
+	exp, err := cloudwatch_exporter.NewCloudwatchExporter(opts.ID, opts.Logger, exporterConfig, fipsEnabled, a.LabelsSnakeCase, a.Debug, a.UseAWSSDKVersion2)
 	return exp, getHash(a), err
 }
diff --git a/internal/component/prometheus/exporter/cloudwatch/config.go b/internal/component/prometheus/exporter/cloudwatch/config.go
index 560f530a44..a4413a0a13 100644
--- a/internal/component/prometheus/exporter/cloudwatch/config.go
+++ b/internal/component/prometheus/exporter/cloudwatch/config.go
@@ -15,7 +15,7 @@ import (
 	"github.com/grafana/alloy/syntax"
 )
 
-// Avoid producing absence of values in metrics
+// Avoid producing absence of values in metrics.
 var defaultNilToZero = true
 
 var defaults = Arguments{
@@ -26,6 +26,7 @@ var defaults = Arguments{
 		Enabled:        false,
 		ScrapeInterval: 5 * time.Minute,
 	},
+	LabelsSnakeCase: false,
 	UseAWSSDKVersion2: false,
 }
 
@@ -39,6 +40,7 @@ type Arguments struct {
 	Static                []StaticJob           `alloy:"static,block,optional"`
 	CustomNamespace       []CustomNamespaceJob  `alloy:"custom_namespace,block,optional"`
 	DecoupledScrape       DecoupledScrapeConfig `alloy:"decoupled_scraping,block,optional"`
+	LabelsSnakeCase     bool                  `alloy:"labels_snake_case,attr,optional"`
 	UseAWSSDKVersion2     bool                  `alloy:"aws_sdk_version_v2,attr,optional"`
 }
 
@@ -60,9 +62,11 @@ type DiscoveryJob struct {
 	DimensionNameRequirements []string       `alloy:"dimension_name_requirements,attr,optional"`
 	RecentlyActiveOnly        bool           `alloy:"recently_active_only,attr,optional"`
 	Metrics                   []Metric       `alloy:"metric,block"`
+	Period                    time.Duration  `alloy:"period,attr,optional"`
+	Length                    time.Duration  `alloy:"length,attr,optional"`
 	Delay                     time.Duration  `alloy:"delay,attr,optional"`
-	//TODO: Remove NilToZero, because it is deprecated upstream.
-	NilToZero *bool `alloy:"nil_to_zero,attr,optional"`
+	AddCloudwatchTimestamp    *bool          `alloy:"add_cloudwatch_timestamp,attr,optional"`
+	NilToZero                 *bool          `alloy:"nil_to_zero,attr,optional"`
 }
 
 // Tags represents a series of tags configured on an AWS resource. Each tag is a
@@ -77,8 +81,14 @@ type StaticJob struct {
 	Namespace  string         `alloy:"namespace,attr"`
 	Dimensions Dimensions     `alloy:"dimensions,attr"`
 	Metrics    []Metric       `alloy:"metric,block"`
+	Period     time.Duration  `alloy:"period,attr,optional"`
+	Length     time.Duration  `alloy:"length,attr,optional"`
 	Delay      time.Duration  `alloy:"delay,attr,optional"`
-	//TODO: Remove NilToZero, because it is deprecated upstream.
+	// NOTE: This field is actually not supported as a configuration option in YACE!
+	// https://github.com/prometheus-community/yet-another-cloudwatch-exporter/blob/0c9677d91836f0a4150a55172a0ce5081574b407/docs/configuration.md?plain=1#L177
+	// It should either be removed from Alloy in some major release, or
+	// contributed to YACE.
+	// We currently patch it in toStaticJob func to make it work and not break existing configs.
 	NilToZero *bool `alloy:"nil_to_zero,attr,optional"`
 }
 
@@ -91,8 +101,10 @@ type CustomNamespaceJob struct {
 	RecentlyActiveOnly        bool           `alloy:"recently_active_only,attr,optional"`
 	Metrics                   []Metric       `alloy:"metric,block"`
 	Delay                     time.Duration  `alloy:"delay,attr,optional"`
-	//TODO: Remove NilToZero, because it is deprecated upstream.
-	NilToZero *bool `alloy:"nil_to_zero,attr,optional"`
+	Period                    time.Duration  `alloy:"period,attr,optional"`
+	Length                    time.Duration  `alloy:"length,attr,optional"`
+	AddCloudwatchTimestamp    *bool          `alloy:"add_cloudwatch_timestamp,attr,optional"`
+	NilToZero                 *bool          `alloy:"nil_to_zero,attr,optional"`
 }
 
 // RegionAndRoles exposes for each supported job, the AWS regions and IAM roles
@@ -114,7 +126,7 @@ type Dimensions map[string]string
 type Metric struct {
 	Name                   string        `alloy:"name,attr"`
 	Statistics             []string      `alloy:"statistics,attr"`
-	Period                 time.Duration `alloy:"period,attr"`
+	Period                 time.Duration `alloy:"period,attr,optional"`
 	Length                 time.Duration `alloy:"length,attr,optional"`
 	NilToZero              *bool         `alloy:"nil_to_zero,attr,optional"`
 	AddCloudwatchTimestamp *bool         `alloy:"add_cloudwatch_timestamp,attr,optional"`
@@ -243,19 +255,29 @@ func toYACERoles(rs []Role) []yaceConf.Role {
 	return yaceRoles
 }
 
-func toYACEMetrics(ms []Metric, jobNilToZero *bool) []*yaceConf.Metric {
+func toYACEMetrics(ms []Metric, jobPeriod time.Duration, jobLength time.Duration) []*yaceConf.Metric {
 	yaceMetrics := []*yaceConf.Metric{}
 	for _, m := range ms {
+		if m.Period == 0 {
+			m.Period = jobPeriod
+		}
+		if m.Length == 0 {
+			m.Length = jobLength
+		}
+
 		periodSeconds := int64(m.Period.Seconds())
 		lengthSeconds := periodSeconds
-		// If length is other than zero, that is, it is configured, override the default period value
+		// If length is other than zero, that is, it is configured, override the default length value
 		if m.Length != 0 {
 			lengthSeconds = int64(m.Length.Seconds())
 		}
-		nilToZero := m.NilToZero
-		if nilToZero == nil {
-			nilToZero = jobNilToZero
-		}
+
+		/* Scenarios:
+			- Period and length are zero (not set) -> Period = "5m", Length = "5m". These defaults are set by YACE.
+			- Period = 1m, Length = 0m -> Period = "1m", Length = "1m". Length is set equal to Period by this function.
+			- Period = 0, Length = 10m -> Period = "5m", Length = "10m". Period is set to the default value by YACE.
+			- Period = 10m, Length = 2m -> Period = "10m", Length = "2m". This is not a valid configuration and will cause an error produced by YACE. See https://github.com/prometheus-community/yet-another-cloudwatch-exporter/blob/292db29c1537af84a5e831b007bc9ff501708eaa/pkg/config/config.go#L390
+		*/
 		yaceMetrics = append(yaceMetrics, &yaceConf.Metric{
 			Name:       m.Name,
 			Statistics: m.Statistics,
@@ -265,10 +287,11 @@ func toYACEMetrics(ms []Metric, jobNilToZero *bool) []*yaceConf.Metric {
 			// by Alloy every so often, dictated by the scrapedInterval, CloudWatch should return a single datapoint
 			// for each requested metric. That is if Period >= Length, but is Period > Length, we will be getting not enough
 			// data to fill the whole aggregation bucket. Therefore, Period == Length.
+			// NOTE: Period > Length is not a valid configuration and will cause an error. See https://github.com/prometheus-community/yet-another-cloudwatch-exporter/blob/292db29c1537af84a5e831b007bc9ff501708eaa/pkg/config/config.go#L390
 			Period: periodSeconds,
 			Length: lengthSeconds,
 
-			NilToZero:              nilToZero,
+			NilToZero:              m.NilToZero,
 			AddCloudwatchTimestamp: m.AddCloudwatchTimestamp,
 		})
 	}
@@ -283,10 +306,19 @@ func toYACEStaticJob(sj StaticJob) *yaceConf.Static {
 			Value: value,
 		})
 	}
-	nilToZero := sj.NilToZero
-	if nilToZero == nil {
-		nilToZero = &defaultNilToZero
+
+	// For each metric in sj.Metrics, if the NilToZero is not set, set the NilToZero to the job level NilToZero or DefaultNilToZero.
+	// This is needed to make the `nil_to_zero` option work in static jobs as this is not natively supported by YACE.
+	for i, m := range sj.Metrics {
+		if m.NilToZero == nil {
+			if sj.NilToZero == nil {
+				sj.Metrics[i].NilToZero = &defaultNilToZero
+			} else {
+				sj.Metrics[i].NilToZero = sj.NilToZero
+			}
+		}
 	}
+
 	return &yaceConf.Static{
 		Name:       sj.Name,
 		Regions:    sj.Auth.Regions,
@@ -294,11 +326,12 @@ func toYACEStaticJob(sj StaticJob) *yaceConf.Static {
 		Namespace:  sj.Namespace,
 		CustomTags: sj.CustomTags.toYACE(),
 		Dimensions: dims,
-		Metrics:    toYACEMetrics(sj.Metrics, nilToZero),
+		Metrics:    toYACEMetrics(sj.Metrics, 0, 0),
 	}
 }
 
 func toYACEDiscoveryJob(rj DiscoveryJob) *yaceConf.Job {
+	// The default of YACE is false, but for Alloy we want to default to true.
 	nilToZero := rj.NilToZero
 	if nilToZero == nil {
 		nilToZero = &defaultNilToZero
@@ -310,19 +343,21 @@ func toYACEDiscoveryJob(rj DiscoveryJob) *yaceConf.Job {
 		CustomTags:                rj.CustomTags.toYACE(),
 		SearchTags:                rj.SearchTags.toYACE(),
 		DimensionNameRequirements: rj.DimensionNameRequirements,
-		// By setting RoundingPeriod to nil, the exporter will align the start and end times for retrieving CloudWatch
-		// metrics, with the smallest period in the retrieved batch.
-		RoundingPeriod:     nil,
 		RecentlyActiveOnly: rj.RecentlyActiveOnly,
 		JobLevelMetricFields: yaceConf.JobLevelMetricFields{
-			Delay: int64(rj.Delay.Seconds()),
+			AddCloudwatchTimestamp: rj.AddCloudwatchTimestamp,
+			Period:                 int64(rj.Period.Seconds()),
+			Length:                 int64(rj.Length.Seconds()),
+			Delay:                  int64(rj.Delay.Seconds()),
+			NilToZero:              nilToZero,
 		},
-		Metrics: toYACEMetrics(rj.Metrics, nilToZero),
+		Metrics: toYACEMetrics(rj.Metrics, rj.Period, rj.Length),
 	}
 	return job
 }
 
 func toYACECustomNamespaceJob(cn CustomNamespaceJob) *yaceConf.CustomNamespace {
+	// The default of YACE is false, but for Alloy we want to default to true.
 	nilToZero := cn.NilToZero
 	if nilToZero == nil {
 		nilToZero = &defaultNilToZero
@@ -334,14 +369,15 @@ func toYACECustomNamespaceJob(cn CustomNamespaceJob) *yaceConf.CustomNamespace {
 		Roles:                     toYACERoles(cn.Auth.Roles),
 		CustomTags:                cn.CustomTags.toYACE(),
 		DimensionNameRequirements: cn.DimensionNameRequirements,
-		// By setting RoundingPeriod to nil, the exporter will align the start and end times for retrieving CloudWatch
-		// metrics, with the smallest period in the retrieved batch.
-		RoundingPeriod:     nil,
 		RecentlyActiveOnly: cn.RecentlyActiveOnly,
 		JobLevelMetricFields: yaceConf.JobLevelMetricFields{
-			Delay: int64(cn.Delay.Seconds()),
+			AddCloudwatchTimestamp: cn.AddCloudwatchTimestamp,
+			Period:                 int64(cn.Period.Seconds()),
+			Length:                 int64(cn.Length.Seconds()),
+			Delay:                  int64(cn.Delay.Seconds()),
+			NilToZero:              nilToZero,
 		},
-		Metrics: toYACEMetrics(cn.Metrics, nilToZero),
+		Metrics: toYACEMetrics(cn.Metrics, cn.Period, cn.Length),
 	}
 }
 
diff --git a/internal/component/prometheus/exporter/cloudwatch/config_test.go b/internal/component/prometheus/exporter/cloudwatch/config_test.go
index cdbb1524d0..669ad745c8 100644
--- a/internal/component/prometheus/exporter/cloudwatch/config_test.go
+++ b/internal/component/prometheus/exporter/cloudwatch/config_test.go
@@ -39,6 +39,32 @@ sts_region = "us-east-2"
 debug = true
 `
 
+const customNamespaceInvalidPeriodConfig = `
+sts_region = "eu-west-1"
+
+custom_namespace "testMetrics" {
+    namespace = "TestMetrics"
+    regions   = ["us-east-1"]
+		period = "5m"
+
+    metric {
+        name       = "metric1"
+        statistics = ["Average"]
+        length     = "5m"
+    }
+
+    metric {
+        name       = "metric2"
+        statistics = ["Sum"]
+        length     = "2m"
+    }
+}
+`
+
+// ===========
+// Single Jobs
+//============
+
 const singleStaticJobConfig = `
 sts_region = "us-east-2"
 debug = true
@@ -56,6 +82,90 @@ static "super_ec2_instance_id" {
 }
 `
 
+var expectedSingleStaticJobConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	StaticJobs: []yaceModel.StaticJob{
+		{
+			Name: "super_ec2_instance_id",
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles:      []yaceModel.Role{{}},
+			Regions:    []string{"us-east-2"},
+			Namespace:  "AWS/EC2",
+			CustomTags: []yaceModel.Tag{},
+			Dimensions: []yaceModel.Dimension{
+				{
+					Name:  "InstanceId",
+					Value: "i01u29u12ue1u2c",
+				},
+			},
+			Metrics: []*yaceModel.MetricConfig{{
+				Name:       "CPUUsage",
+				Statistics: []string{"Sum", "Average"},
+				Period:     60,
+				Length:     60,
+				Delay:      0,
+				NilToZero:  defaultNilToZero,
+			}},
+		},
+	},
+}
+
+const singleCustomNamespaceJobConfig = `
+sts_region = "eu-west-1"
+
+custom_namespace "customEC2Metrics" {
+    namespace = "CustomEC2Metrics"
+    regions   = ["us-east-1"]
+
+    metric {
+        name       = "cpu_usage_idle"
+        statistics = ["Average"]
+        period     = "5m"
+    }
+
+    metric {
+        name       = "disk_free"
+        statistics = ["Average"]
+        period     = "5m"
+    }
+}
+`
+
+var expectedCustomNamespaceJobConfig = yaceModel.JobsConfig{
+	StsRegion: "eu-west-1",
+	CustomNamespaceJobs: []yaceModel.CustomNamespaceJob{
+		{
+			Name:    "customEC2Metrics",
+			Regions: []string{"us-east-1"},
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles:      []yaceModel.Role{{}},
+			CustomTags: []yaceModel.Tag{},
+			Namespace:  "CustomEC2Metrics",
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:       "cpu_usage_idle",
+					Statistics: []string{"Average"},
+					Period:     300,
+					Length:     300,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+				{
+					Name:       "disk_free",
+					Statistics: []string{"Average"},
+					Period:     300,
+					Length:     300,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+			},
+			RoundingPeriod: nil,
+		},
+	},
+}
+
 const discoveryJobConfig = `
 sts_region = "us-east-2"
 debug = true
@@ -109,26 +219,112 @@ discovery {
 }
 `
 
-const customNamespaceJobConfig = `
-sts_region = "eu-west-1"
-
-custom_namespace "customEC2Metrics" {
-    namespace = "CustomEC2Metrics"
-    regions   = ["us-east-1"]
-
-    metric {
-        name       = "cpu_usage_idle"
-        statistics = ["Average"]
-        period     = "5m"
-    }
-
-    metric {
-        name       = "disk_free"
-        statistics = ["Average"]
-        period     = "5m"
-    }
+var expectedDiscoveryJobConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	DiscoveryJobs: []yaceModel.DiscoveryJob{
+		{
+			Regions: []string{"us-east-2"},
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles: []yaceModel.Role{{}},
+			Type:  "AWS/SQS",
+			SearchTags: []yaceModel.SearchTag{{
+				Key: "scrape", Value: regexp.MustCompile("true"),
+			}},
+			CustomTags: []yaceModel.Tag{},
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:       "NumberOfMessagesSent",
+					Statistics: []string{"Sum", "Average"},
+					Period:     60,
+					Length:     60,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+				{
+					Name:       "NumberOfMessagesReceived",
+					Statistics: []string{"Sum", "Average"},
+					Period:     60,
+					Length:     60,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+			},
+			RoundingPeriod:        nil,
+			ExportedTagsOnMetrics: []string{"name"},
+			DimensionsRegexps: []yaceModel.DimensionsRegexp{
+				{
+					Regexp:          regexp.MustCompile("(?P<QueueName>[^:]+)$"),
+					DimensionsNames: []string{"QueueName"},
+				},
+			},
+		},
+		{
+			Regions: []string{"us-east-1"},
+			Roles: []yaceModel.Role{{
+				RoleArn: "arn:aws:iam::878167871295:role/yace_testing",
+			}},
+			Type:       "AWS/ECS",
+			SearchTags: []yaceModel.SearchTag{},
+			CustomTags: []yaceModel.Tag{},
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:       "CPUUtilization",
+					Statistics: []string{"Sum", "Maximum"},
+					Period:     60,
+					Length:     60,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+			},
+			RoundingPeriod:        nil,
+			ExportedTagsOnMetrics: []string{},
+			DimensionsRegexps: []yaceModel.DimensionsRegexp{
+				{
+					Regexp:          regexp.MustCompile(":cluster/(?P<ClusterName>[^/]+)$"),
+					DimensionsNames: []string{"ClusterName"},
+				},
+				{
+					Regexp:          regexp.MustCompile(":service/(?P<ClusterName>[^/]+)/(?P<ServiceName>[^/]+)$"),
+					DimensionsNames: []string{"ClusterName", "ServiceName"},
+				},
+			},
+		},
+		{
+			Regions: []string{"us-east-1"},
+			Roles: []yaceModel.Role{{
+				RoleArn: "arn:aws:iam::878167871295:role/yace_testing",
+			}},
+			Type:                      "AWS/S3",
+			SearchTags:                []yaceModel.SearchTag{},
+			CustomTags:                []yaceModel.Tag{},
+			DimensionNameRequirements: []string{"BucketName"},
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:       "BucketSizeBytes",
+					Statistics: []string{"Sum"},
+					Period:     60,
+					Length:     3600,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+			},
+			RoundingPeriod:        nil,
+			ExportedTagsOnMetrics: []string{},
+			RecentlyActiveOnly:    true,
+			DimensionsRegexps: []yaceModel.DimensionsRegexp{
+				{
+					Regexp:          regexp.MustCompile("(?P<BucketName>[^:]+)$"),
+					DimensionsNames: []string{"BucketName"},
+				},
+			},
+		},
+	},
 }
-`
+
+// ================
+// nil_to_zero jobs
+//=================
 
 const staticJobNilToZeroConfig = `
 sts_region = "us-east-2"
@@ -149,6 +345,35 @@ static "super_ec2_instance_id" {
 }
 `
 
+var expectedStaticJobNilToZeroConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	StaticJobs: []yaceModel.StaticJob{
+		{
+			Name: "super_ec2_instance_id",
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles:      []yaceModel.Role{{}},
+			Regions:    []string{"us-east-2"},
+			Namespace:  "AWS/EC2",
+			CustomTags: []yaceModel.Tag{},
+			Dimensions: []yaceModel.Dimension{
+				{
+					Name:  "InstanceId",
+					Value: "i01u29u12ue1u2c",
+				},
+			},
+			Metrics: []*yaceModel.MetricConfig{{
+				Name:       "CPUUsage",
+				Statistics: []string{"Sum", "Average"},
+				Period:     60,
+				Length:     60,
+				Delay:      0,
+				NilToZero:  falsePtr,
+			}},
+		},
+	},
+}
+
 const staticJobNilToZeroMetricConfig = `
 sts_region = "us-east-2"
 debug = true
@@ -168,6 +393,35 @@ static "super_ec2_instance_id" {
 }
 `
 
+var expectedStaticJobNilToZeroMetricConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	StaticJobs: []yaceModel.StaticJob{
+		{
+			Name: "super_ec2_instance_id",
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles:      []yaceModel.Role{{}},
+			Regions:    []string{"us-east-2"},
+			Namespace:  "AWS/EC2",
+			CustomTags: []yaceModel.Tag{},
+			Dimensions: []yaceModel.Dimension{
+				{
+					Name:  "InstanceId",
+					Value: "i01u29u12ue1u2c",
+				},
+			},
+			Metrics: []*yaceModel.MetricConfig{{
+				Name:       "CPUUsage",
+				Statistics: []string{"Sum", "Average"},
+				Period:     60,
+				Length:     60,
+				Delay:      0,
+				NilToZero:  falsePtr,
+			}},
+		},
+	},
+}
+
 const discoveryJobNilToZeroConfig = `
 sts_region = "us-east-2"
 debug = true
@@ -195,53 +449,583 @@ discovery {
 }
 `
 
-const customNamespacebNilToZeroJobConfig = `
+var expectedDiscoveryJobNilToZeroConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	DiscoveryJobs: []yaceModel.DiscoveryJob{
+		{
+			Regions: []string{"us-east-2"},
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles: []yaceModel.Role{{}},
+			Type:  "AWS/SQS",
+			SearchTags: []yaceModel.SearchTag{{
+				Key: "scrape", Value: regexp.MustCompile("true"),
+			}},
+			CustomTags: []yaceModel.Tag{},
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:       "NumberOfMessagesSent",
+					Statistics: []string{"Sum", "Average"},
+					Period:     60,
+					Length:     60,
+					Delay:      0,
+					NilToZero:  falsePtr,
+				},
+				{
+					Name:       "NumberOfMessagesReceived",
+					Statistics: []string{"Sum", "Average"},
+					Period:     60,
+					Length:     60,
+					Delay:      0,
+					NilToZero:  truePtr,
+				},
+			},
+			RoundingPeriod:        nil,
+			ExportedTagsOnMetrics: []string{"name"},
+			DimensionsRegexps: []yaceModel.DimensionsRegexp{
+				{
+					Regexp:          regexp.MustCompile("(?P<QueueName>[^:]+)$"),
+					DimensionsNames: []string{"QueueName"},
+				},
+			},
+		},
+	},
+}
+
+const customNamespaceNilToZeroJobConfig = `
 sts_region = "eu-west-1"
 
 custom_namespace "customEC2Metrics" {
     namespace = "CustomEC2Metrics"
     regions   = ["us-east-1"]
-	// setting nil_to_zero on the job level
-	nil_to_zero = false
+		// setting nil_to_zero on the job level
+		nil_to_zero = false
 
     metric {
         name       = "cpu_usage_idle"
         statistics = ["Average"]
         period     = "5m"
-		add_cloudwatch_timestamp = true
+				add_cloudwatch_timestamp = true
     }
 
     metric {
         name       = "disk_free"
         statistics = ["Average"]
         period     = "5m"
-		// setting nil_to_zero on the metric level
-		nil_to_zero = true
-		add_cloudwatch_timestamp = false
+				// setting nil_to_zero on the metric level
+				nil_to_zero = true
     }
 }
 `
 
-const discoveryJobDelayConfig = `
+var expectedCustomNamespaceJobNilToZeroConfig = yaceModel.JobsConfig{
+	StsRegion: "eu-west-1",
+	CustomNamespaceJobs: []yaceModel.CustomNamespaceJob{
+		{
+			Name:    "customEC2Metrics",
+			Regions: []string{"us-east-1"},
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles:      []yaceModel.Role{{}},
+			CustomTags: []yaceModel.Tag{},
+			Namespace:  "CustomEC2Metrics",
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:                   "cpu_usage_idle",
+					Statistics:             []string{"Average"},
+					Period:                 300,
+					Length:                 300,
+					Delay:                  0,
+					NilToZero:              falsePtr,
+					AddCloudwatchTimestamp: truePtr,
+				},
+				{
+					Name:                   "disk_free",
+					Statistics:             []string{"Average"},
+					Period:                 300,
+					Length:                 300,
+					Delay:                  0,
+					NilToZero:              truePtr,
+					AddCloudwatchTimestamp: falsePtr,
+				},
+			},
+			RoundingPeriod: nil,
+		},
+	},
+}
+
+// ================
+// Period jobs
+//=================
+
+// Shows that the default period and length of 5m is used. Static jobs do not support job level period and length settings.
+const staticJobDefaultPeriodConfig = `
 sts_region = "us-east-2"
 debug = true
+static "super_ec2_instance_id" {
+	regions = ["us-east-2"]
+	namespace = "ec2"
+	dimensions = {
+		"InstanceId" = "i01u29u12ue1u2c",
+	}
+	metric {
+		name = "CPUUsage"
+		statistics = ["Sum", "Average"]
+	}
+}`
+
+var expectedStaticJobDefaultPeriodConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	StaticJobs: []yaceModel.StaticJob{
+		{
+			Name: "super_ec2_instance_id",
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles:      []yaceModel.Role{{}},
+			Regions:    []string{"us-east-2"},
+			Namespace:  "AWS/EC2",
+			CustomTags: []yaceModel.Tag{},
+			Dimensions: []yaceModel.Dimension{
+				{
+					Name:  "InstanceId",
+					Value: "i01u29u12ue1u2c",
+				},
+			},
+			Metrics: []*yaceModel.MetricConfig{{
+				Name:       "CPUUsage",
+				Statistics: []string{"Sum", "Average"},
+				Period:     300,
+				Length:     300,
+				Delay:      0,
+				NilToZero:  defaultNilToZero,
+			}},
+		},
+	},
+}
+
+// Shows that the default period and length of 5m is used when not set on the job or metric level.
+const customNamespaceDefaultPeriodConfig = `
+sts_region = "eu-west-1"
+
+custom_namespace "customEC2Metrics" {
+    namespace = "CustomEC2Metrics"
+    regions   = ["us-east-1"]
+
+    metric {
+        name       = "cpu_usage_idle"
+        statistics = ["Average"]
+    }
+
+    metric {
+        name       = "disk_free"
+        statistics = ["Average"]
+    }
+}
+`
+
+var expectedCustomNamespaceJobDefaultPeriodConfig = yaceModel.JobsConfig{
+	StsRegion: "eu-west-1",
+	CustomNamespaceJobs: []yaceModel.CustomNamespaceJob{
+		{
+			Name:    "customEC2Metrics",
+			Regions: []string{"us-east-1"},
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles:      []yaceModel.Role{{}},
+			CustomTags: []yaceModel.Tag{},
+			Namespace:  "CustomEC2Metrics",
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:       "cpu_usage_idle",
+					Statistics: []string{"Average"},
+					Period:     300,
+					Length:     300,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+				{
+					Name:       "disk_free",
+					Statistics: []string{"Average"},
+					Period:     300,
+					Length:     300,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+			},
+			RoundingPeriod: nil,
+		},
+	},
+}
+
+// Shows that the default period and length of 5m is used when not set on the job or metric level.
+const discoveryJobDefaultPeriodConfig = `
+sts_region = "us-east-2"
+debug = true
+discovery_exported_tags = { "AWS/SQS" = ["name"] }
 discovery {
-	type = "AWS/EC2"
+	type = "AWS/SQS"
 	regions = ["us-east-2"]
-	delay = "2m"
+	search_tags = {
+		"scrape" = "true",
+	}
+	metric {
+		name = "NumberOfMessagesSent"
+		statistics = ["Sum", "Average"]
+	}
+	metric {
+		name = "NumberOfMessagesReceived"
+		statistics = ["Sum", "Average"]
+	}
+}
+`
+
+var expectedDiscoveryJobDefaultPeriodConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	DiscoveryJobs: []yaceModel.DiscoveryJob{
+		{
+			Regions: []string{"us-east-2"},
+			Roles:   []yaceModel.Role{{}},
+			Type:    "AWS/SQS",
+			SearchTags: []yaceModel.SearchTag{{
+				Key: "scrape", Value: regexp.MustCompile("true"),
+			}},
+			CustomTags: []yaceModel.Tag{},
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:       "NumberOfMessagesSent",
+					Statistics: []string{"Sum", "Average"},
+					Period:     300,
+					Length:     300,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+				{
+					Name:       "NumberOfMessagesReceived",
+					Statistics: []string{"Sum", "Average"},
+					Period:     300,
+					Length:     300,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+			},
+			RoundingPeriod:        nil,
+			ExportedTagsOnMetrics: []string{"name"},
+			DimensionsRegexps: []yaceModel.DimensionsRegexp{
+				{
+					Regexp:          regexp.MustCompile("(?P<QueueName>[^:]+)$"),
+					DimensionsNames: []string{"QueueName"},
+				},
+			},
+		},
+	},
+}
+
+// Shows we can set period on the job level and override it on the metric level.
+const discoveryJobPeriodConfig = `
+sts_region = "us-east-2"
+debug = true
+discovery_exported_tags = { "AWS/SQS" = ["name"] }
+discovery {
+	type = "AWS/SQS"
+	regions = ["us-east-2"]
+	search_tags = {
+		"scrape" = "true",
+	}
+	period = "3m"
+	metric {
+		name = "NumberOfMessagesSent"
+		statistics = ["Sum", "Average"]
+	}
+	metric {
+		name = "NumberOfMessagesReceived"
+		statistics = ["Sum", "Average"]
+		period = "1m"
+	}
+}
+`
+
+var expectedDiscoveryJobPeriodConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	DiscoveryJobs: []yaceModel.DiscoveryJob{
+		{
+			Regions: []string{"us-east-2"},
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles: []yaceModel.Role{{}},
+			Type:  "AWS/SQS",
+			SearchTags: []yaceModel.SearchTag{{
+				Key: "scrape", Value: regexp.MustCompile("true"),
+			}},
+			CustomTags: []yaceModel.Tag{},
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:       "NumberOfMessagesSent",
+					Statistics: []string{"Sum", "Average"},
+					Period:     180,
+					Length:     180,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+				{
+					Name:       "NumberOfMessagesReceived",
+					Statistics: []string{"Sum", "Average"},
+					Period:     60,
+					Length:     60,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+			},
+			RoundingPeriod:        nil,
+			ExportedTagsOnMetrics: []string{"name"},
+			DimensionsRegexps: []yaceModel.DimensionsRegexp{
+				{
+					Regexp:          regexp.MustCompile("(?P<QueueName>[^:]+)$"),
+					DimensionsNames: []string{"QueueName"},
+				},
+			},
+		},
+	},
+}
+
+// Shows we can set period on the job level and override it on the metric level.
+const customNameSpaceJobPeriodConfig = `
+sts_region = "eu-west-1"
+
+custom_namespace "customEC2Metrics" {
+    namespace = "CustomEC2Metrics"
+    regions   = ["us-east-1"]
+		period = "3m"
+    metric {
+        name       = "cpu_usage_idle"
+        statistics = ["Average"]
+    }
+
+    metric {
+        name       = "disk_free"
+        statistics = ["Average"]
+				// Override on metric level
+        period     = "1m"
+    }
+}
+`
+
+var expectedCustomNamespaceJobPeriodConfig = yaceModel.JobsConfig{
+	StsRegion: "eu-west-1",
+	CustomNamespaceJobs: []yaceModel.CustomNamespaceJob{
+		{
+			Name:       "customEC2Metrics",
+			Namespace:  "CustomEC2Metrics",
+			Regions:    []string{"us-east-1"},
+			Roles:      []yaceModel.Role{{}},
+			CustomTags: []yaceModel.Tag{},
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:       "cpu_usage_idle",
+					Statistics: []string{"Average"},
+					Period:     180,
+					Length:     180,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+				{
+					Name:       "disk_free",
+					Statistics: []string{"Average"},
+					Period:     60,
+					Length:     60,
+					Delay:      0,
+					NilToZero:  defaultNilToZero,
+				},
+			},
+		},
+	},
+}
+
+// =============================
+// add_cloudwatch_timestamp jobs
+//==============================
+
+// Shows that add_cloudwatch_timestamp is not supported on static jobs will be set to false on metrics.
+const staticJobAddCloudwatchTimestampConfig = `
+sts_region = "us-east-2"
+debug = true
+static "test_instance" {
+	regions = ["us-east-2"]
+	namespace = "AWS/EC2"
+	dimensions = {
+		"InstanceId" = "i-test",
+	}
 	metric {
 		name = "CPUUtilization"
 		statistics = ["Average"]
 		period = "5m"
 	}
+}
+`
+
+var expectedStaticJobAddCloudwatchTimestampConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	StaticJobs: []yaceModel.StaticJob{
+		{
+			Name:       "test_instance",
+			Roles:      []yaceModel.Role{{}},
+			Regions:    []string{"us-east-2"},
+			Namespace:  "AWS/EC2",
+			CustomTags: []yaceModel.Tag{},
+			Dimensions: []yaceModel.Dimension{
+				{
+					Name:  "InstanceId",
+					Value: "i-test",
+				},
+			},
+			Metrics: []*yaceModel.MetricConfig{{
+				Name:                   "CPUUtilization",
+				Statistics:             []string{"Average"},
+				Period:                 300,
+				Length:                 300,
+				Delay:                  0,
+				NilToZero:              defaultNilToZero,
+				AddCloudwatchTimestamp: falsePtr,
+			}},
+		},
+	},
+}
+
+// Shows we can set add_cloudwatch_timestamp on the job level and override it on the metric level.
+const customNamespaceAddCloudwatchTimestampConfig = `
+sts_region = "eu-west-1"
+
+custom_namespace "customEC2Metrics" {
+    namespace = "CustomEC2Metrics"
+    regions   = ["us-east-1"]
+		add_cloudwatch_timestamp = true
+
+    metric {
+        name       = "cpu_usage_idle"
+        statistics = ["Average"]
+        period     = "5m"
+    }
+
+    metric {
+        name       = "disk_free"
+        statistics = ["Average"]
+        period     = "5m"
+				add_cloudwatch_timestamp = false
+    }
+}
+`
+
+var expectedCustomNamespaceJobAddCloudwatchTimestampConfig = yaceModel.JobsConfig{
+	StsRegion: "eu-west-1",
+	CustomNamespaceJobs: []yaceModel.CustomNamespaceJob{
+		{
+			Name:    "customEC2Metrics",
+			Regions: []string{"us-east-1"},
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles:      []yaceModel.Role{{}},
+			CustomTags: []yaceModel.Tag{},
+			Namespace:  "CustomEC2Metrics",
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:                   "cpu_usage_idle",
+					Statistics:             []string{"Average"},
+					Period:                 300,
+					Length:                 300,
+					Delay:                  0,
+					NilToZero:              defaultNilToZero,
+					AddCloudwatchTimestamp: truePtr,
+				},
+				{
+					Name:                   "disk_free",
+					Statistics:             []string{"Average"},
+					Period:                 300,
+					Length:                 300,
+					Delay:                  0,
+					NilToZero:              defaultNilToZero,
+					AddCloudwatchTimestamp: falsePtr,
+				},
+			},
+			RoundingPeriod: nil,
+		},
+	},
+}
+
+// Shows we can set add_cloudwatch_timestamp on the job level and override it on the metric level.
+const discoveryJobAddCloudwatchTimestampConfig = `
+sts_region = "us-east-2"
+debug = true
+discovery_exported_tags = { "AWS/SQS" = ["name"] }
+discovery {
+	type = "AWS/SQS"
+	regions = ["us-east-2"]
+	search_tags = {
+		"scrape" = "true",
+	}
+	add_cloudwatch_timestamp = true
 	metric {
-		name = "NetworkIn"
-		statistics = ["Sum"]
-		period = "5m"
+		name = "NumberOfMessagesSent"
+		statistics = ["Sum", "Average"]
+		period = "1m"
+	}
+	metric {
+		name = "NumberOfMessagesReceived"
+		statistics = ["Sum", "Average"]
+		period = "1m"
+		add_cloudwatch_timestamp = false
 	}
 }
 `
 
+var expectedDiscoveryJobAddCloudwatchTimestampConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	DiscoveryJobs: []yaceModel.DiscoveryJob{
+		{
+			Regions: []string{"us-east-2"},
+			// assert an empty role is used as default. IMPORTANT since this
+			// is what YACE looks for delegating to the environment role
+			Roles: []yaceModel.Role{{}},
+			Type:  "AWS/SQS",
+			SearchTags: []yaceModel.SearchTag{{
+				Key: "scrape", Value: regexp.MustCompile("true"),
+			}},
+			CustomTags: []yaceModel.Tag{},
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:                   "NumberOfMessagesSent",
+					Statistics:             []string{"Sum", "Average"},
+					Period:                 60,
+					Length:                 60,
+					Delay:                  0,
+					NilToZero:              defaultNilToZero,
+					AddCloudwatchTimestamp: truePtr,
+				},
+				{
+					Name:                   "NumberOfMessagesReceived",
+					Statistics:             []string{"Sum", "Average"},
+					Period:                 60,
+					Length:                 60,
+					Delay:                  0,
+					NilToZero:              defaultNilToZero,
+					AddCloudwatchTimestamp: falsePtr,
+				},
+			},
+			RoundingPeriod:        nil,
+			ExportedTagsOnMetrics: []string{"name"},
+			DimensionsRegexps: []yaceModel.DimensionsRegexp{
+				{
+					Regexp:          regexp.MustCompile("(?P<QueueName>[^:]+)$"),
+					DimensionsNames: []string{"QueueName"},
+				},
+			},
+		},
+	},
+}
+
+// ==========
+// delay jobs
+//===========
+
+// Shows that job level delay is not supported for static jobs and will be set to zero.
 const staticJobDelayConfig = `
 sts_region = "us-east-2"
 debug = true
@@ -259,13 +1043,100 @@ static "test_instance" {
 }
 `
 
+var expectedStaticJobDelayConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	StaticJobs: []yaceModel.StaticJob{
+		{
+			Name:       "test_instance",
+			Roles:      []yaceModel.Role{{}},
+			Regions:    []string{"us-east-2"},
+			Namespace:  "AWS/EC2",
+			CustomTags: []yaceModel.Tag{},
+			Dimensions: []yaceModel.Dimension{
+				{
+					Name:  "InstanceId",
+					Value: "i-test",
+				},
+			},
+			Metrics: []*yaceModel.MetricConfig{{
+				Name:       "CPUUtilization",
+				Statistics: []string{"Average"},
+				Period:     300,
+				Length:     300,
+				Delay:      0, // Delay not supported for static jobs
+				NilToZero:  defaultNilToZero,
+			}},
+		},
+	},
+}
+
+// Shows that the job level delay is used for all metrics in the job.
+const discoveryJobDelayConfig = `
+sts_region = "us-east-2"
+debug = true
+discovery {
+	type = "AWS/EC2"
+	regions = ["us-east-2"]
+	delay = "2m"
+	metric {
+		name = "CPUUtilization"
+		statistics = ["Average"]
+		period = "5m"
+	}
+	metric {
+		name = "NetworkIn"
+		statistics = ["Sum"]
+		period = "5m"
+	}
+}
+`
+
+var expectedDiscoveryJobDelayConfig = yaceModel.JobsConfig{
+	StsRegion: "us-east-2",
+	DiscoveryJobs: []yaceModel.DiscoveryJob{
+		{
+			Regions:    []string{"us-east-2"},
+			Roles:      []yaceModel.Role{{}},
+			Type:       "AWS/EC2",
+			SearchTags: []yaceModel.SearchTag{},
+			CustomTags: []yaceModel.Tag{},
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:       "CPUUtilization",
+					Statistics: []string{"Average"},
+					Period:     300,
+					Length:     300,
+					Delay:      120,
+					NilToZero:  defaultNilToZero,
+				},
+				{
+					Name:       "NetworkIn",
+					Statistics: []string{"Sum"},
+					Period:     300,
+					Length:     300,
+					Delay:      120,
+					NilToZero:  defaultNilToZero,
+				},
+			},
+			RoundingPeriod:        nil,
+			ExportedTagsOnMetrics: []string{},
+			DimensionsRegexps: []yaceModel.DimensionsRegexp{
+				{
+					Regexp:          regexp.MustCompile("instance/(?P<InstanceId>[^/]+)"),
+					DimensionsNames: []string{"InstanceId"},
+				},
+			},
+		},
+	},
+}
+
 const customNamespaceDelayConfig = `
 sts_region = "eu-west-1"
 
 custom_namespace "testMetrics" {
     namespace = "TestMetrics"
     regions   = ["us-east-1"]
-	delay = "30s"
+		delay = "30s"
 
     metric {
         name       = "metric1"
@@ -281,6 +1152,38 @@ custom_namespace "testMetrics" {
 }
 `
 
+var expectedCustomNamespaceDelayConfig = yaceModel.JobsConfig{
+	StsRegion: "eu-west-1",
+	CustomNamespaceJobs: []yaceModel.CustomNamespaceJob{
+		{
+			Name:       "testMetrics",
+			Regions:    []string{"us-east-1"},
+			Roles:      []yaceModel.Role{{}},
+			CustomTags: []yaceModel.Tag{},
+			Namespace:  "TestMetrics",
+			Metrics: []*yaceModel.MetricConfig{
+				{
+					Name:       "metric1",
+					Statistics: []string{"Average"},
+					Period:     60,
+					Length:     60,
+					Delay:      30,
+					NilToZero:  defaultNilToZero,
+				},
+				{
+					Name:       "metric2",
+					Statistics: []string{"Sum"},
+					Period:     60,
+					Length:     60,
+					Delay:      30,
+					NilToZero:  defaultNilToZero,
+				},
+			},
+			RoundingPeriod: nil,
+		},
+	},
+}
+
 func TestCloudwatchComponentConfig(t *testing.T) {
 	type testcase struct {
 		raw                 string
@@ -302,426 +1205,81 @@ func TestCloudwatchComponentConfig(t *testing.T) {
 			raw:              noJobsInConfig,
 			expectConvertErr: true,
 		},
-		"single static job config": {
-			raw: singleStaticJobConfig,
-			expected: yaceModel.JobsConfig{
-				StsRegion: "us-east-2",
-				StaticJobs: []yaceModel.StaticJob{
-					{
-						Name: "super_ec2_instance_id",
-						// assert an empty role is used as default. IMPORTANT since this
-						// is what YACE looks for delegating to the environment role
-						Roles:      []yaceModel.Role{{}},
-						Regions:    []string{"us-east-2"},
-						Namespace:  "AWS/EC2",
-						CustomTags: []yaceModel.Tag{},
-						Dimensions: []yaceModel.Dimension{
-							{
-								Name:  "InstanceId",
-								Value: "i01u29u12ue1u2c",
-							},
-						},
-						Metrics: []*yaceModel.MetricConfig{{
-							Name:       "CPUUsage",
-							Statistics: []string{"Sum", "Average"},
-							Period:     60,
-							Length:     60,
-							Delay:      0,
-							NilToZero:  defaultNilToZero,
-						}},
-					},
-				},
-			},
+		"period cannot be greater than length": {
+			raw:              customNamespaceInvalidPeriodConfig,
+			expectConvertErr: true,
 		},
-		"single discovery job config": {
-			raw: discoveryJobConfig,
-			expected: yaceModel.JobsConfig{
-				StsRegion: "us-east-2",
-				DiscoveryJobs: []yaceModel.DiscoveryJob{
-					{
-						Regions: []string{"us-east-2"},
-						// assert an empty role is used as default. IMPORTANT since this
-						// is what YACE looks for delegating to the environment role
-						Roles: []yaceModel.Role{{}},
-						Type:  "AWS/SQS",
-						SearchTags: []yaceModel.SearchTag{{
-							Key: "scrape", Value: regexp.MustCompile("true"),
-						}},
-						CustomTags: []yaceModel.Tag{},
-						Metrics: []*yaceModel.MetricConfig{
-							{
-								Name:       "NumberOfMessagesSent",
-								Statistics: []string{"Sum", "Average"},
-								Period:     60,
-								Length:     60,
-								Delay:      0,
-								NilToZero:  defaultNilToZero,
-							},
-							{
-								Name:       "NumberOfMessagesReceived",
-								Statistics: []string{"Sum", "Average"},
-								Period:     60,
-								Length:     60,
-								Delay:      0,
-								NilToZero:  defaultNilToZero,
-							},
-						},
-						RoundingPeriod:        nil,
-						ExportedTagsOnMetrics: []string{"name"},
-						DimensionsRegexps: []yaceModel.DimensionsRegexp{
-							{
-								Regexp:          regexp.MustCompile("(?P<QueueName>[^:]+)$"),
-								DimensionsNames: []string{"QueueName"},
-							},
-						},
-					},
-					{
-						Regions: []string{"us-east-1"},
-						Roles: []yaceModel.Role{{
-							RoleArn: "arn:aws:iam::878167871295:role/yace_testing",
-						}},
-						Type:       "AWS/ECS",
-						SearchTags: []yaceModel.SearchTag{},
-						CustomTags: []yaceModel.Tag{},
-						Metrics: []*yaceModel.MetricConfig{
-							{
-								Name:       "CPUUtilization",
-								Statistics: []string{"Sum", "Maximum"},
-								Period:     60,
-								Length:     60,
-								Delay:      0,
-								NilToZero:  defaultNilToZero,
-							},
-						},
-						RoundingPeriod:        nil,
-						ExportedTagsOnMetrics: []string{},
-						DimensionsRegexps: []yaceModel.DimensionsRegexp{
-							{
-								Regexp:          regexp.MustCompile(":cluster/(?P<ClusterName>[^/]+)$"),
-								DimensionsNames: []string{"ClusterName"},
-							},
-							{
-								Regexp:          regexp.MustCompile(":service/(?P<ClusterName>[^/]+)/(?P<ServiceName>[^/]+)$"),
-								DimensionsNames: []string{"ClusterName", "ServiceName"},
-							},
-						},
-					},
-					{
-						Regions: []string{"us-east-1"},
-						Roles: []yaceModel.Role{{
-							RoleArn: "arn:aws:iam::878167871295:role/yace_testing",
-						}},
-						Type:                      "AWS/S3",
-						SearchTags:                []yaceModel.SearchTag{},
-						CustomTags:                []yaceModel.Tag{},
-						DimensionNameRequirements: []string{"BucketName"},
-						Metrics: []*yaceModel.MetricConfig{
-							{
-								Name:       "BucketSizeBytes",
-								Statistics: []string{"Sum"},
-								Period:     60,
-								Length:     3600,
-								Delay:      0,
-								NilToZero:  defaultNilToZero,
-							},
-						},
-						RoundingPeriod:        nil,
-						ExportedTagsOnMetrics: []string{},
-						RecentlyActiveOnly:    true,
-						DimensionsRegexps: []yaceModel.DimensionsRegexp{
-							{
-								Regexp:          regexp.MustCompile("(?P<BucketName>[^:]+)$"),
-								DimensionsNames: []string{"BucketName"},
-							},
-						},
-					},
-				},
-			},
+		"single static job config": {
+			raw:      singleStaticJobConfig,
+			expected: expectedSingleStaticJobConfig,
 		},
 		"single custom namespace job config": {
-			raw: customNamespaceJobConfig,
-			expected: yaceModel.JobsConfig{
-				StsRegion: "eu-west-1",
-				CustomNamespaceJobs: []yaceModel.CustomNamespaceJob{
-					{
-						Name:    "customEC2Metrics",
-						Regions: []string{"us-east-1"},
-						// assert an empty role is used as default. IMPORTANT since this
-						// is what YACE looks for delegating to the environment role
-						Roles:      []yaceModel.Role{{}},
-						CustomTags: []yaceModel.Tag{},
-						Namespace:  "CustomEC2Metrics",
-						Metrics: []*yaceModel.MetricConfig{
-							{
-								Name:       "cpu_usage_idle",
-								Statistics: []string{"Average"},
-								Period:     300,
-								Length:     300,
-								Delay:      0,
-								NilToZero:  defaultNilToZero,
-							},
-							{
-								Name:       "disk_free",
-								Statistics: []string{"Average"},
-								Period:     300,
-								Length:     300,
-								Delay:      0,
-								NilToZero:  defaultNilToZero,
-							},
-						},
-						RoundingPeriod: nil,
-					},
-				},
-			},
+			raw:      singleCustomNamespaceJobConfig,
+			expected: expectedCustomNamespaceJobConfig,
+		},
+		"multiple discovery job config": {
+			raw:      discoveryJobConfig,
+			expected: expectedDiscoveryJobConfig,
 		},
 		"static job nil to zero": {
-			raw: staticJobNilToZeroConfig,
-			expected: yaceModel.JobsConfig{
-				StsRegion: "us-east-2",
-				StaticJobs: []yaceModel.StaticJob{
-					{
-						Name: "super_ec2_instance_id",
-						// assert an empty role is used as default. IMPORTANT since this
-						// is what YACE looks for delegating to the environment role
-						Roles:      []yaceModel.Role{{}},
-						Regions:    []string{"us-east-2"},
-						Namespace:  "AWS/EC2",
-						CustomTags: []yaceModel.Tag{},
-						Dimensions: []yaceModel.Dimension{
-							{
-								Name:  "InstanceId",
-								Value: "i01u29u12ue1u2c",
-							},
-						},
-						Metrics: []*yaceModel.MetricConfig{{
-							Name:       "CPUUsage",
-							Statistics: []string{"Sum", "Average"},
-							Period:     60,
-							Length:     60,
-							Delay:      0,
-							NilToZero:  falsePtr,
-						}},
-					},
-				},
-			},
+			raw:      staticJobNilToZeroConfig,
+			expected: expectedStaticJobNilToZeroConfig,
 		},
 		"static job nil to zero metric": {
-			raw: staticJobNilToZeroMetricConfig,
-			expected: yaceModel.JobsConfig{
-				StsRegion: "us-east-2",
-				StaticJobs: []yaceModel.StaticJob{
-					{
-						Name: "super_ec2_instance_id",
-						// assert an empty role is used as default. IMPORTANT since this
-						// is what YACE looks for delegating to the environment role
-						Roles:      []yaceModel.Role{{}},
-						Regions:    []string{"us-east-2"},
-						Namespace:  "AWS/EC2",
-						CustomTags: []yaceModel.Tag{},
-						Dimensions: []yaceModel.Dimension{
-							{
-								Name:  "InstanceId",
-								Value: "i01u29u12ue1u2c",
-							},
-						},
-						Metrics: []*yaceModel.MetricConfig{{
-							Name:       "CPUUsage",
-							Statistics: []string{"Sum", "Average"},
-							Period:     60,
-							Length:     60,
-							Delay:      0,
-							NilToZero:  falsePtr,
-						}},
-					},
-				},
-			},
+			raw:      staticJobNilToZeroMetricConfig,
+			expected: expectedStaticJobNilToZeroMetricConfig,
 		},
 		"discovery job nil to zero config": {
-			raw: discoveryJobNilToZeroConfig,
-			expected: yaceModel.JobsConfig{
-				StsRegion: "us-east-2",
-				DiscoveryJobs: []yaceModel.DiscoveryJob{
-					{
-						Regions: []string{"us-east-2"},
-						// assert an empty role is used as default. IMPORTANT since this
-						// is what YACE looks for delegating to the environment role
-						Roles: []yaceModel.Role{{}},
-						Type:  "AWS/SQS",
-						SearchTags: []yaceModel.SearchTag{{
-							Key: "scrape", Value: regexp.MustCompile("true"),
-						}},
-						CustomTags: []yaceModel.Tag{},
-						Metrics: []*yaceModel.MetricConfig{
-							{
-								Name:       "NumberOfMessagesSent",
-								Statistics: []string{"Sum", "Average"},
-								Period:     60,
-								Length:     60,
-								Delay:      0,
-								NilToZero:  falsePtr,
-							},
-							{
-								Name:       "NumberOfMessagesReceived",
-								Statistics: []string{"Sum", "Average"},
-								Period:     60,
-								Length:     60,
-								Delay:      0,
-								NilToZero:  truePtr,
-							},
-						},
-						RoundingPeriod:        nil,
-						ExportedTagsOnMetrics: []string{"name"},
-						DimensionsRegexps: []yaceModel.DimensionsRegexp{
-							{
-								Regexp:          regexp.MustCompile("(?P<QueueName>[^:]+)$"),
-								DimensionsNames: []string{"QueueName"},
-							},
-						},
-					},
-				},
-			},
+			raw:      discoveryJobNilToZeroConfig,
+			expected: expectedDiscoveryJobNilToZeroConfig,
 		},
 		"custom namespace job nil to zero config": {
-			raw: customNamespacebNilToZeroJobConfig,
-			expected: yaceModel.JobsConfig{
-				StsRegion: "eu-west-1",
-				CustomNamespaceJobs: []yaceModel.CustomNamespaceJob{
-					{
-						Name:    "customEC2Metrics",
-						Regions: []string{"us-east-1"},
-						// assert an empty role is used as default. IMPORTANT since this
-						// is what YACE looks for delegating to the environment role
-						Roles:      []yaceModel.Role{{}},
-						CustomTags: []yaceModel.Tag{},
-						Namespace:  "CustomEC2Metrics",
-						Metrics: []*yaceModel.MetricConfig{
-							{
-								Name:                   "cpu_usage_idle",
-								Statistics:             []string{"Average"},
-								Period:                 300,
-								Length:                 300,
-								Delay:                  0,
-								NilToZero:              falsePtr,
-								AddCloudwatchTimestamp: truePtr,
-							},
-							{
-								Name:                   "disk_free",
-								Statistics:             []string{"Average"},
-								Period:                 300,
-								Length:                 300,
-								Delay:                  0,
-								NilToZero:              truePtr,
-								AddCloudwatchTimestamp: falsePtr,
-							},
-						},
-						RoundingPeriod: nil,
-					},
-				},
-			},
+			raw:      customNamespaceNilToZeroJobConfig,
+			expected: expectedCustomNamespaceJobNilToZeroConfig,
 		},
-		"discovery job with delay": {
-			raw: discoveryJobDelayConfig,
-			expected: yaceModel.JobsConfig{
-				StsRegion: "us-east-2",
-				DiscoveryJobs: []yaceModel.DiscoveryJob{
-					{
-						Regions:    []string{"us-east-2"},
-						Roles:      []yaceModel.Role{{}},
-						Type:       "AWS/EC2",
-						SearchTags: []yaceModel.SearchTag{},
-						CustomTags: []yaceModel.Tag{},
-						Metrics: []*yaceModel.MetricConfig{
-							{
-								Name:       "CPUUtilization",
-								Statistics: []string{"Average"},
-								Period:     300,
-								Length:     300,
-								Delay:      120, // 2 minutes
-								NilToZero:  defaultNilToZero,
-							},
-							{
-								Name:       "NetworkIn",
-								Statistics: []string{"Sum"},
-								Period:     300,
-								Length:     300,
-								Delay:      120, // 2 minutes
-								NilToZero:  defaultNilToZero,
-							},
-						},
-						RoundingPeriod:        nil,
-						ExportedTagsOnMetrics: []string{},
-						DimensionsRegexps: []yaceModel.DimensionsRegexp{
-							{
-								Regexp:          regexp.MustCompile("instance/(?P<InstanceId>[^/]+)"),
-								DimensionsNames: []string{"InstanceId"},
-							},
-						},
-					},
-				},
-			},
+		"static job default period config": {
+			raw:      staticJobDefaultPeriodConfig,
+			expected: expectedStaticJobDefaultPeriodConfig,
+		},
+		"custom namespace job default period config": {
+			raw:      customNamespaceDefaultPeriodConfig,
+			expected: expectedCustomNamespaceJobDefaultPeriodConfig,
+		},
+		"discovery job default period config": {
+			raw:      discoveryJobDefaultPeriodConfig,
+			expected: expectedDiscoveryJobDefaultPeriodConfig,
+		},
+		"discovery job period config": {
+			raw:      discoveryJobPeriodConfig,
+			expected: expectedDiscoveryJobPeriodConfig,
+		},
+		"custom namespace job period config": {
+			raw:      customNameSpaceJobPeriodConfig,
+			expected: expectedCustomNamespaceJobPeriodConfig,
+		},
+		"static job add cloudwatch timestamp config": {
+			raw:      staticJobAddCloudwatchTimestampConfig,
+			expected: expectedStaticJobAddCloudwatchTimestampConfig,
+		},
+		"custom namespace job add cloudwatch timestamp config": {
+			raw:      customNamespaceAddCloudwatchTimestampConfig,
+			expected: expectedCustomNamespaceJobAddCloudwatchTimestampConfig,
+		},
+		"discovery job add cloudwatch timestamp config": {
+			raw:      discoveryJobAddCloudwatchTimestampConfig,
+			expected: expectedDiscoveryJobAddCloudwatchTimestampConfig,
 		},
 		"static job with delay": {
-			raw: staticJobDelayConfig,
-			expected: yaceModel.JobsConfig{
-				StsRegion: "us-east-2",
-				StaticJobs: []yaceModel.StaticJob{
-					{
-						Name:       "test_instance",
-						Roles:      []yaceModel.Role{{}},
-						Regions:    []string{"us-east-2"},
-						Namespace:  "AWS/EC2",
-						CustomTags: []yaceModel.Tag{},
-						Dimensions: []yaceModel.Dimension{
-							{
-								Name:  "InstanceId",
-								Value: "i-test",
-							},
-						},
-						Metrics: []*yaceModel.MetricConfig{{
-							Name:       "CPUUtilization",
-							Statistics: []string{"Average"},
-							Period:     300,
-							Length:     300,
-							Delay:      0, // Delay not supported for static jobs
-							NilToZero:  defaultNilToZero,
-						}},
-					},
-				},
-			},
+			raw:      staticJobDelayConfig,
+			expected: expectedStaticJobDelayConfig,
+		},
+		"discovery job with delay": {
+			raw:      discoveryJobDelayConfig,
+			expected: expectedDiscoveryJobDelayConfig,
 		},
 		"custom namespace job with delay": {
-			raw: customNamespaceDelayConfig,
-			expected: yaceModel.JobsConfig{
-				StsRegion: "eu-west-1",
-				CustomNamespaceJobs: []yaceModel.CustomNamespaceJob{
-					{
-						Name:       "testMetrics",
-						Regions:    []string{"us-east-1"},
-						Roles:      []yaceModel.Role{{}},
-						CustomTags: []yaceModel.Tag{},
-						Namespace:  "TestMetrics",
-						Metrics: []*yaceModel.MetricConfig{
-							{
-								Name:       "metric1",
-								Statistics: []string{"Average"},
-								Period:     60,
-								Length:     60,
-								Delay:      30, // 30 seconds
-								NilToZero:  defaultNilToZero,
-							},
-							{
-								Name:       "metric2",
-								Statistics: []string{"Sum"},
-								Period:     60,
-								Length:     60,
-								Delay:      30, // 30 seconds
-								NilToZero:  defaultNilToZero,
-							},
-						},
-						RoundingPeriod: nil,
-					},
-				},
-			},
+			raw:      customNamespaceDelayConfig,
+			expected: expectedCustomNamespaceDelayConfig,
 		},
 	} {
 		t.Run(name, func(t *testing.T) {
diff --git a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go
index 7efc87cf39..ee4474ff48 100644
--- a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go
+++ b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go
@@ -33,10 +33,11 @@ type exporter struct {
 	logger               *slog.Logger
 	cachingClientFactory cachingFactory
 	scrapeConf           yaceModel.JobsConfig
+	labelsSnakeCase    bool
 }
 
 // NewCloudwatchExporter creates a new YACE wrapper, that implements Integration
-func NewCloudwatchExporter(name string, logger log.Logger, conf yaceModel.JobsConfig, fipsEnabled, debug bool, useAWSSDKVersionV2 bool) (*exporter, error) {
+func NewCloudwatchExporter(name string, logger log.Logger, conf yaceModel.JobsConfig, fipsEnabled, labelsSnakeCase, debug, useAWSSDKVersionV2 bool) (*exporter, error) {
 	var factory cachingFactory
 	var err error
 
@@ -57,6 +58,7 @@ func NewCloudwatchExporter(name string, logger log.Logger, conf yaceModel.JobsCo
 		logger:               l,
 		cachingClientFactory: factory,
 		scrapeConf:           conf,
+		labelsSnakeCase:    labelsSnakeCase,
 	}, nil
 }
 
@@ -84,7 +86,7 @@ func (e *exporter) MetricsHandler() (http.Handler, error) {
 			reg,
 			e.cachingClientFactory,
 			yace.MetricsPerQuery(metricsPerQuery),
-			yace.LabelsSnakeCase(labelsSnakeCase),
+			yace.LabelsSnakeCase(e.labelsSnakeCase),
 			yace.CloudWatchAPIConcurrency(cloudWatchConcurrency),
 			yace.TaggingAPIConcurrency(tagConcurrency),
 		)
diff --git a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go
index 99f51abb3f..e9eaf77d52 100644
--- a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go
+++ b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go
@@ -26,6 +26,7 @@ type asyncExporter struct {
 	cachingClientFactory cachingFactory
 	scrapeConf           yaceModel.JobsConfig
 	registry             atomic.Pointer[prometheus.Registry]
+	labelsSnakeCase    bool
 	// scrapeInterval is the frequency in which a background go-routine collects new AWS metrics via YACE.
 	scrapeInterval time.Duration
 }
@@ -33,7 +34,7 @@ type asyncExporter struct {
 // NewDecoupledCloudwatchExporter creates a new YACE wrapper, that implements Integration. The decouple feature spawns a
 // background go-routine to perform YACE metric collection allowing for a decoupled collection of AWS metrics from the
 // ServerHandler.
-func NewDecoupledCloudwatchExporter(name string, logger log.Logger, conf yaceModel.JobsConfig, scrapeInterval time.Duration, fipsEnabled, debug bool, useAWSSDKVersionV2 bool) (*asyncExporter, error) {
+func NewDecoupledCloudwatchExporter(name string, logger log.Logger, conf yaceModel.JobsConfig, scrapeInterval time.Duration, fipsEnabled, labelsSnakeCase, debug, useAWSSDKVersionV2 bool) (*asyncExporter, error) {
 	var factory cachingFactory
 	var err error
 
@@ -53,6 +54,7 @@ func NewDecoupledCloudwatchExporter(name string, logger log.Logger, conf yaceMod
 		cachingClientFactory: factory,
 		scrapeConf:           conf,
 		registry:             atomic.Pointer[prometheus.Registry]{},
+		labelsSnakeCase:    labelsSnakeCase,
 		scrapeInterval:       scrapeInterval,
 	}, nil
 }
@@ -112,7 +114,7 @@ func (e *asyncExporter) scrape(ctx context.Context) {
 		reg,
 		e.cachingClientFactory,
 		yace.MetricsPerQuery(metricsPerQuery),
-		yace.LabelsSnakeCase(labelsSnakeCase),
+		yace.LabelsSnakeCase(e.labelsSnakeCase),
 		yace.CloudWatchAPIConcurrency(cloudWatchConcurrency),
 		yace.TaggingAPIConcurrency(tagConcurrency),
 	)
diff --git a/internal/static/integrations/cloudwatch_exporter/config.go b/internal/static/integrations/cloudwatch_exporter/config.go
index 4ad226be82..992e66664b 100644
--- a/internal/static/integrations/cloudwatch_exporter/config.go
+++ b/internal/static/integrations/cloudwatch_exporter/config.go
@@ -143,10 +143,10 @@ func (c *Config) NewIntegration(l log.Logger) (integrations.Integration, error)
 		if v := c.DecoupledScrape.ScrapeInterval; v != nil {
 			scrapeInterval = *v
 		}
-		return NewDecoupledCloudwatchExporter(c.Name(), l, exporterConfig, scrapeInterval, fipsEnabled, c.Debug, c.UseAWSSDKVersion2)
+		return NewDecoupledCloudwatchExporter(c.Name(), l, exporterConfig, scrapeInterval, fipsEnabled, c.Debug, labelsSnakeCase, c.UseAWSSDKVersion2)
 	}
 
-	return NewCloudwatchExporter(c.Name(), l, exporterConfig, fipsEnabled, c.Debug, c.UseAWSSDKVersion2)
+	return NewCloudwatchExporter(c.Name(), l, exporterConfig, fipsEnabled, c.Debug, labelsSnakeCase, c.UseAWSSDKVersion2)
 }
 
 // getHash calculates the MD5 hash of the yaml representation of the config