diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts
index 36318208b4..63feb1e2cd 100644
--- a/client/src/app/api/models.ts
+++ b/client/src/app/api/models.ts
@@ -456,7 +456,7 @@ export interface Target {
   labels?: TargetLabel[];
   image?: RulesetImage;
   ruleset: Ruleset;
-  provider?: string[];
+  provider?: string;
 }
 
 export interface Metadata {
diff --git a/client/src/app/components/SimpleSelectCheckbox.tsx b/client/src/app/components/SimpleSelectCheckbox.tsx
index fb8f871a6c..e77aed251d 100644
--- a/client/src/app/components/SimpleSelectCheckbox.tsx
+++ b/client/src/app/components/SimpleSelectCheckbox.tsx
@@ -93,11 +93,12 @@ export const SimpleSelectCheckbox: React.FC<ISimpleSelectBasicProps> = ({
       onOpenChange={setIsOpen}
       toggle={(toggleref: React.Ref<MenuToggleElement>) => (
         <MenuToggle
+          aria-label={toggleAriaLabel}
+          id={toggleId}
           ref={toggleref}
           onClick={onToggleClick}
           style={{ width: width && width + "px" }}
           isExpanded={isOpen}
-          id={toggleId}
         >
           <span className={spacing.mrSm}>{placeholderText}</span>
           {selectedItems.length > 0 && (
@@ -110,6 +111,7 @@ export const SimpleSelectCheckbox: React.FC<ISimpleSelectBasicProps> = ({
       <SelectList>
         {selectOptions.map((option, index) => (
           <SelectOption
+            id={`checkbox-for-${option.value}`}
             hasCheckbox
             key={option.value}
             isFocused={index === 0}
diff --git a/client/src/app/components/target-card/target-card.tsx b/client/src/app/components/target-card/target-card.tsx
index 9e30a14f79..7f535fb702 100644
--- a/client/src/app/components/target-card/target-card.tsx
+++ b/client/src/app/components/target-card/target-card.tsx
@@ -110,6 +110,7 @@ export const TargetCard: React.FC<TargetCardProps> = ({
 
   return (
     <Card
+      id={`target-card-${target.name.replace(/\s/g, "-")}`}
       onClick={handleCardClick}
       isSelectable
       isSelected={isCardSelected}
@@ -117,7 +118,7 @@ export const TargetCard: React.FC<TargetCardProps> = ({
     >
       <CardHeader
         selectableActions={{
-          selectableActionId: "" + target.id,
+          selectableActionId: "target-name-" + target.name,
           selectableActionAriaLabelledby: `${target.name}-selectable-action-label`,
           isChecked: isCardSelected,
         }}
diff --git a/client/src/app/pages/applications/analysis-wizard/set-targets.tsx b/client/src/app/pages/applications/analysis-wizard/set-targets.tsx
index d5a4756e60..3ddbdebb9d 100644
--- a/client/src/app/pages/applications/analysis-wizard/set-targets.tsx
+++ b/client/src/app/pages/applications/analysis-wizard/set-targets.tsx
@@ -184,7 +184,7 @@ export const SetTargets: React.FC<SetTargetsProps> = ({ applications }) => {
         onChange={(selection) => {
           setProvider(selection as string[]);
         }}
-        toggleId="language-select-toggle"
+        toggleId="action-select-toggle"
       />
       {values.selectedTargets.length === 0 &&
         values.customRulesFiles.length === 0 &&
diff --git a/client/src/app/pages/migration-targets/components/custom-target-form.tsx b/client/src/app/pages/migration-targets/components/custom-target-form.tsx
index 0a7f5fbadf..9e7e5edab5 100644
--- a/client/src/app/pages/migration-targets/components/custom-target-form.tsx
+++ b/client/src/app/pages/migration-targets/components/custom-target-form.tsx
@@ -307,7 +307,7 @@ export const CustomTargetForm: React.FC<CustomTargetFormProps> = ({
             },
           }),
       },
-      provider: [providerType] || ["Java"],
+      provider: providerType || "Java",
     };
 
     if (target) {