diff --git a/pkg/cmd/remote_generate.go b/pkg/cmd/remote_generate.go
index 5634599c466f532b14f9cb831ba07ba158283657..22f36434419a46b3c526b364ae8fb8d72e978f8f 100644
--- a/pkg/cmd/remote_generate.go
+++ b/pkg/cmd/remote_generate.go
@@ -249,8 +249,7 @@ dockerRegistryPrompt:
 	if !skipRegistry {
 		s := corev1.Secret{
 			ObjectMeta: metav1.ObjectMeta{
-				// TODO: handle secret name conflicts
-				Name:      "regsecret",
+				Name:      o.Remote.GetName() + "-regsecret",
 				Namespace: o.Remote.GetNamespace(),
 			},
 			Type: corev1.SecretTypeDockerConfigJson,
@@ -284,7 +283,7 @@ dockerRegistryPrompt:
 		o.Remote.Spec.Registry = v1alpha1.RegistrySpec{
 			Url: fmt.Sprintf("%s/%s", registry, username),
 			Credentials: v1alpha1.CredentialsSpec{
-				SecretRef: "regsecret",
+				SecretRef: o.Remote.GetName() + "-regsecret",
 			},
 		}
 	}