diff --git a/recipes/newrelic/infrastructure/agent-control/debian.yml b/recipes/newrelic/infrastructure/agent-control/debian.yml
index f6ef3b68..0abb50d0 100644
--- a/recipes/newrelic/infrastructure/agent-control/debian.yml
+++ b/recipes/newrelic/infrastructure/agent-control/debian.yml
@@ -85,7 +85,7 @@ install:
         - task: update_otel_license_key
         - task: config_supervisors
         - task: config_fleet_id
-        - task: config_opamp
+        - task: config_fleet_control
         - task: config_agent_control_auth
         - task: config_host_monitoring
         - task: update_otel_mem_limit
@@ -450,16 +450,16 @@ install:
             sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-agent-control/config.yaml
           fi
 
-    config_opamp:
+    config_fleet_control:
       status:
         - test -f /etc/newrelic-agent-control/.nr-cli
       cmds:
         - |
           if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" = "false" ]; then
-            sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+            sed -i '/^\s*fleet_control:/s/^/#/' /etc/newrelic-agent-control/config.yaml
             sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-agent-control/config.yaml
           else
-            sed -i 's/s*#\s*opamp:/opamp:/g' /etc/newrelic-agent-control/config.yaml
+            sed -i 's/s*#\s*fleet_control:/fleet_control:/g' /etc/newrelic-agent-control/config.yaml
             sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/# //' /etc/newrelic-agent-control/config.yaml
           fi
         - |
diff --git a/recipes/newrelic/infrastructure/agent-control/rhel.yml b/recipes/newrelic/infrastructure/agent-control/rhel.yml
index 2a1826c9..81b55374 100644
--- a/recipes/newrelic/infrastructure/agent-control/rhel.yml
+++ b/recipes/newrelic/infrastructure/agent-control/rhel.yml
@@ -105,7 +105,7 @@ install:
         - task: update_otel_license_key
         - task: config_supervisors
         - task: config_fleet_id
-        - task: config_opamp
+        - task: config_fleet_control
         - task: config_agent_control_auth
         - task: config_host_monitoring
         - task: update_otel_mem_limit
@@ -393,16 +393,16 @@ install:
             sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-agent-control/config.yaml
           fi
 
-    config_opamp:
+    config_fleet_control:
       status:
         - test -f /etc/newrelic-agent-control/.nr-cli
       cmds:
         - |
           if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" = "false" ]; then
-            sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+            sed -i '/^\s*fleet_control:/s/^/#/' /etc/newrelic-agent-control/config.yaml
             sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-agent-control/config.yaml
           else
-            sed -i 's/s*#\s*opamp:/opamp:/g' /etc/newrelic-agent-control/config.yaml
+            sed -i 's/s*#\s*fleet_control:/fleet_control:/g' /etc/newrelic-agent-control/config.yaml
             sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/# //' /etc/newrelic-agent-control/config.yaml
           fi
         - |
diff --git a/recipes/newrelic/infrastructure/agent-control/suse.yml b/recipes/newrelic/infrastructure/agent-control/suse.yml
index 6882bd66..2f55da53 100644
--- a/recipes/newrelic/infrastructure/agent-control/suse.yml
+++ b/recipes/newrelic/infrastructure/agent-control/suse.yml
@@ -71,7 +71,7 @@ install:
         - task: update_otel_license_key
         - task: config_supervisors
         - task: config_fleet_id
-        - task: config_opamp
+        - task: config_fleet_control
         - task: config_agent_control_auth
         - task: config_host_monitoring
         - task: update_otel_mem_limit
@@ -340,16 +340,16 @@ install:
             sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-agent-control/config.yaml
           fi
 
-    config_opamp:
+    config_fleet_control:
       status:
         - test -f /etc/newrelic-agent-control/.nr-cli
       cmds:
         - |
           if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" = "false" ]; then
-            sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+            sed -i '/^\s*fleet_control:/s/^/#/' /etc/newrelic-agent-control/config.yaml
             sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-agent-control/config.yaml
           else
-            sed -i 's/s*#\s*opamp:/opamp:/g' /etc/newrelic-agent-control/config.yaml
+            sed -i 's/s*#\s*fleet_control:/fleet_control:/g' /etc/newrelic-agent-control/config.yaml
             sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/# //' /etc/newrelic-agent-control/config.yaml
           fi
         - |