diff --git a/Dockerfile.rhel b/Dockerfile.rhel
index 4d9d859dd8..78e814e424 100644
--- a/Dockerfile.rhel
+++ b/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi7/ubi-minimal:latest
 
-ARG AGENT_VERSION="5.20.1"
+ARG AGENT_VERSION="5.21.0"
 LABEL name="SignalFx Smart Agent" \
 	  maintainer="SignalFx, Inc." \
 	  vendor="SignalFx, Inc." \
diff --git a/deployments/cloudfoundry/buildpack/bin/supply b/deployments/cloudfoundry/buildpack/bin/supply
index 1b0ec3b1b8..f9f1c48f2c 100755
--- a/deployments/cloudfoundry/buildpack/bin/supply
+++ b/deployments/cloudfoundry/buildpack/bin/supply
@@ -11,7 +11,7 @@ BUILDPACK_DIR=`dirname $(readlink -f ${BASH_SOURCE%/*})`
 TARGET_DIR="$BUILD_DIR/.signalfx"
 
 # Set a default version of the SignalFx Agent to use if none is specified
-SIGNALFX_AGENT_VERSION="${SIGNALFX_AGENT_VERSION-5.20.1}"
+SIGNALFX_AGENT_VERSION="${SIGNALFX_AGENT_VERSION-5.21.0}"
 
 echo "-----> Installing signalfx-agent ${SIGNALFX_AGENT_VERSION}"
 echo "       BUILD_DIR: $BUILD_DIR"
diff --git a/deployments/ecs/signalfx-agent-task.json b/deployments/ecs/signalfx-agent-task.json
index 6e330e14ff..097d6f1012 100644
--- a/deployments/ecs/signalfx-agent-task.json
+++ b/deployments/ecs/signalfx-agent-task.json
@@ -33,7 +33,7 @@
                 },
                 {
                     "name": "CONFIG_URL",
-                    "value": "https://raw.githubusercontent.com/signalfx/signalfx-agent/v5.20.1/deployments/ecs/agent.yaml"
+                    "value": "https://raw.githubusercontent.com/signalfx/signalfx-agent/v5.21.0/deployments/ecs/agent.yaml"
                 }
             ],
             "ulimits": null,
@@ -60,7 +60,7 @@
             "memory": null,
             "memoryReservation": null,
             "volumesFrom": [],
-            "image": "quay.io/signalfx/signalfx-agent:5.20.1",
+            "image": "quay.io/signalfx/signalfx-agent:5.21.0",
             "disableNetworking": null,
             "healthCheck": null,
             "essential": true,
diff --git a/deployments/fargate/example-fargate-task.json b/deployments/fargate/example-fargate-task.json
index db7064b8ae..496944c8f8 100644
--- a/deployments/fargate/example-fargate-task.json
+++ b/deployments/fargate/example-fargate-task.json
@@ -34,14 +34,14 @@
                 },
                 {
                     "name": "CONFIG_URL",
-                    "value": "https://raw.githubusercontent.com/signalfx/signalfx-agent/v5.20.1/deployments/fargate/agent.yaml"
+                    "value": "https://raw.githubusercontent.com/signalfx/signalfx-agent/v5.21.0/deployments/fargate/agent.yaml"
                 }
             ],
             "dockerLabels": {
                 "app": "signalfx-agent"
             },
             "name": "signalfx-agent",
-            "image": "quay.io/signalfx/signalfx-agent:5.20.1"
+            "image": "quay.io/signalfx/signalfx-agent:5.21.0"
         }
     ],
     "cpu": "128",
diff --git a/deployments/k8s/daemonset.yaml b/deployments/k8s/daemonset.yaml
index a132441b00..59edd7a9b7 100644
--- a/deployments/k8s/daemonset.yaml
+++ b/deployments/k8s/daemonset.yaml
@@ -6,7 +6,7 @@ metadata:
   name: signalfx-agent
   labels:
     app: signalfx-agent
-    version: 5.20.1
+    version: 5.21.0
 spec:
   selector:
     matchLabels:
@@ -20,7 +20,7 @@ spec:
     metadata:
       labels:
         app: signalfx-agent
-        version: 5.20.1
+        version: 5.21.0
 
       annotations:
         {}
@@ -45,7 +45,7 @@ spec:
 
       containers:
       - name: signalfx-agent
-        image: "quay.io/signalfx/signalfx-agent:5.20.1"
+        image: "quay.io/signalfx/signalfx-agent:5.21.0"
         imagePullPolicy: IfNotPresent
         command:
         - /bin/signalfx-agent
diff --git a/deployments/k8s/helm/signalfx-agent/Chart.yaml b/deployments/k8s/helm/signalfx-agent/Chart.yaml
index 7db2d0a537..43379a230c 100644
--- a/deployments/k8s/helm/signalfx-agent/Chart.yaml
+++ b/deployments/k8s/helm/signalfx-agent/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: The SignalFx Smart Agent
 name: signalfx-agent
-appVersion: 5.20.1
+appVersion: 5.21.0
 version: 1.9.4
 keywords:
 - monitoring
diff --git a/deployments/k8s/helm/signalfx-agent/README.md b/deployments/k8s/helm/signalfx-agent/README.md
index aec1b0bb61..2e250ba2ef 100644
--- a/deployments/k8s/helm/signalfx-agent/README.md
+++ b/deployments/k8s/helm/signalfx-agent/README.md
@@ -88,7 +88,7 @@ gatherClusterMetrics: false
 # If your kube install is using CRI-O instead of docker, set the below to false.
 gatherDockerMetrics: true
 
-agentVersion: 5.20.1
+agentVersion: 5.21.0
 
 # Kubelet on Windows doesn't seem to have the usage_bytes metrics so we'll
 # transform the working set metric to it so that built-in content works.
@@ -107,7 +107,7 @@ kubeletAPI:
 image:
   repository: quay.io/signalfx/signalfx-agent
   # This is a special windows container release of the agent for Windows.
-  tag: 5.20.1-windows
+  tag: 5.21.0-windows
   pullPolicy: Always
 ```
 
diff --git a/deployments/k8s/helm/signalfx-agent/values.yaml b/deployments/k8s/helm/signalfx-agent/values.yaml
index 75d1abbb34..7bebcc9656 100644
--- a/deployments/k8s/helm/signalfx-agent/values.yaml
+++ b/deployments/k8s/helm/signalfx-agent/values.yaml
@@ -1,6 +1,6 @@
 # Version of the signalfx-agent to deploy.  This will be the default for the
 # docker image tag if not overridden with imageTag
-agentVersion: 5.20.1
+agentVersion: 5.21.0
 
 # If false, datapoints, events, and spans will not be emitted to the SignalFx
 # backend.
diff --git a/deployments/k8s/serverless/deployment.yaml b/deployments/k8s/serverless/deployment.yaml
index a57f8ca462..887524682f 100644
--- a/deployments/k8s/serverless/deployment.yaml
+++ b/deployments/k8s/serverless/deployment.yaml
@@ -8,7 +8,7 @@ metadata:
   name: signalfx-agent
   labels:
     app: signalfx-agent
-    version: 5.20.1
+    version: 5.21.0
 spec:
   replicas: 1
   selector:
@@ -23,7 +23,7 @@ spec:
     metadata:
       labels:
         app: signalfx-agent
-        version: 5.20.1
+        version: 5.21.0
 
       annotations:
         {}
@@ -36,7 +36,7 @@ spec:
 
       containers:
       - name: signalfx-agent
-        image: "quay.io/signalfx/signalfx-agent:5.20.1"
+        image: "quay.io/signalfx/signalfx-agent:5.21.0"
         imagePullPolicy: IfNotPresent
         command:
         - /bin/signalfx-agent
diff --git a/deployments/splunk/docker-compose.yml b/deployments/splunk/docker-compose.yml
index 309c4f0174..8ca630e717 100644
--- a/deployments/splunk/docker-compose.yml
+++ b/deployments/splunk/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       - /opt/splunk/var
       - /opt/splunk/etc
   signalfx-agent:
-    image: quay.io/signalfx/signalfx-agent:5.20.1
+    image: quay.io/signalfx/signalfx-agent:5.21.0
     container_name: signalfx-agent
     restart: always
     depends_on: