diff --git a/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue b/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue
index cdf8500d..674f3e28 100644
--- a/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue
+++ b/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue
@@ -54,7 +54,7 @@ function getDomainFromPipeline(inputKey: string) {
     return;
   }
 
-  if (!CertApplyPluginNames.includes(certStep.type)) {
+  if (certStep?.type?.indexOf?.("CertApply") === -1) {
     targetStepId = getStepIdFromInputKey(certStep.input?.cert);
     certStep = findStepFromPipeline(targetStepId);
     if (!certStep) {
diff --git a/packages/ui/certd-client/src/components/plugins/common/output-selector/index.vue b/packages/ui/certd-client/src/components/plugins/common/output-selector/index.vue
index 654e75a4..69656df3 100644
--- a/packages/ui/certd-client/src/components/plugins/common/output-selector/index.vue
+++ b/packages/ui/certd-client/src/components/plugins/common/output-selector/index.vue
@@ -37,13 +37,9 @@ export default {
         currentStepIndex: currentStepIndex.value,
         currentTask: currentTask.value,
       });
-      if (props.from) {
-        if (typeof props.from === "string") {
-          options.value = options.value.filter((item: any) => item.type === props.from);
-        } else {
-          options.value = options.value.filter((item: any) => props.from.includes(item.type));
-        }
-      }
+      const _certApply = pluginGroups?.groups?.cert?.plugins?.map((item: any) => item.name) || [];
+      const _fromProps = props.from ? (typeof props.from === "string" ? [props.from] : props.from) : [];
+      options.value = options.value.filter((item: any) => _certApply?.includes?.(item.type) || _fromProps.includes(item.type));
 
       if (props.modelValue != null) {
         const found = options.value.find((item: any) => item.value === props.modelValue);