diff --git a/components/datadog/agent/docker.go b/components/datadog/agent/docker.go
index 6d9008166..93d2fdcfb 100644
--- a/components/datadog/agent/docker.go
+++ b/components/datadog/agent/docker.go
@@ -127,17 +127,17 @@ func dockerAgentComposeManifest(agentImagePath string, apiKey pulumi.StringInput
 }
 
 func defaultAgentParams(params *dockeragentparams.Params) {
-	defer func(p *dockeragentparams.Params) {
-		if p.FIPS {
-			p.FullImagePath += "-fips"
-		}
-	}(params)
 	// After setting params.FullImagePath check if you need to use JMX Docker image
 	defer func(p *dockeragentparams.Params) {
 		if p.JMX {
 			p.FullImagePath = fmt.Sprintf("%s-jmx", p.FullImagePath)
 		}
 	}(params)
+	defer func(p *dockeragentparams.Params) {
+		if p.FIPS {
+			p.FullImagePath += "-fips"
+		}
+	}(params)
 
 	if params.FullImagePath != "" {
 		return