diff --git a/pkg/registry/falcon_registry/container.go b/pkg/registry/falcon_registry/container.go
index 342e2a0d..fbf4445e 100644
--- a/pkg/registry/falcon_registry/container.go
+++ b/pkg/registry/falcon_registry/container.go
@@ -14,7 +14,7 @@ func (reg *FalconRegistry) LastContainerTag(ctx context.Context, sensorType falc
 	}
 
 	return lastTag(ctx, systemContext, reg.imageUriContainer(sensorType), func(tag string) bool {
-		tagContains := ".container.x86_64"
+		tagContains := ".container"
 		if sensorType == falcon.ImageSensor {
 			tagContains = ""
 		}
diff --git a/pkg/registry/falcon_registry/node.go b/pkg/registry/falcon_registry/node.go
index 1c07eab5..811828bd 100644
--- a/pkg/registry/falcon_registry/node.go
+++ b/pkg/registry/falcon_registry/node.go
@@ -15,7 +15,7 @@ func (reg *FalconRegistry) LastNodeTag(ctx context.Context, versionRequested *st
 
 	return lastTag(ctx, systemContext, reg.imageUriNode(), func(tag string) bool {
 		return (tag[0] >= '0' && tag[0] <= '9' &&
-			strings.Contains(tag, ".falcon-linux.x86_64") &&
+			strings.Contains(tag, ".falcon-linux") &&
 			(versionRequested == nil || strings.HasPrefix(tag, *versionRequested)))
 	})
 }