diff --git a/internal/controller/controllers/agent_reclaimer.go b/internal/controller/controllers/agent_reclaimer.go
index d590f849a4..db2813fdba 100644
--- a/internal/controller/controllers/agent_reclaimer.go
+++ b/internal/controller/controllers/agent_reclaimer.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/kelseyhightower/envconfig"
 	authzv1 "github.com/openshift/api/authorization/v1"
@@ -235,7 +236,7 @@ func (r *agentReclaimer) createNextStepRunnerDaemonSet(ctx context.Context, c cl
 		})
 	}
 
-	name := fmt.Sprintf("%s-reclaim", nodeName)
+	name := fmt.Sprintf("%s-reclaim", strings.ReplaceAll(nodeName, ".", "_"))
 	var privileged bool = true
 	containers := []corev1.Container{{
 		Name:            name,
diff --git a/internal/controller/controllers/agent_reclaimer_test.go b/internal/controller/controllers/agent_reclaimer_test.go
index 0b11501d0f..a346cba9cf 100644
--- a/internal/controller/controllers/agent_reclaimer_test.go
+++ b/internal/controller/controllers/agent_reclaimer_test.go
@@ -290,10 +290,10 @@ var _ = Context("with a fake client", func() {
 		})
 	})
 
-	Describe("createNextStepRunnerDaemonSet", func() {
+	Describe("CC createNextStepRunnerDaemonSet", func() {
 		var (
 			nodeName      = "node.example.com"
-			daemonSetName = "node.example.com-reclaim"
+			daemonSetName = "node_example_com-reclaim"
 			infraEnvID    string
 			hostID        string
 			nodeUID       string