diff --git a/internal/config/config.go b/internal/config/config.go
index 5670b43115..4be50f6d2d 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -579,8 +579,8 @@ func (c *Config) RemoveProviderExcept(provider cloudprovider.Provider) {
 func (c *Config) IsDebugImage() bool {
 	switch {
 	case c.Provider.AWS != nil:
-		// TODO: Add proper image name validation for AWS when we are closer to release.
-		return true
+		// TODO: Add proper image name validation for AWS as part of rfc/image-discoverability.md
+		return false
 	case c.Provider.Azure != nil:
 		return !azureReleaseImageRegex.MatchString(c.Provider.Azure.Image)
 	case c.Provider.GCP != nil: