diff --git a/docs/docs/release-notes/release-0_15.1_DRAFT.mdx b/docs/docs/release-notes/release-0_15.1_DRAFT.mdx
index ff022e271f..fe28cc79ce 100644
--- a/docs/docs/release-notes/release-0_15.1_DRAFT.mdx
+++ b/docs/docs/release-notes/release-0_15.1_DRAFT.mdx
@@ -24,25 +24,40 @@ title: Release 0.15
 
 # Release 0.15.1
 
-We are thrilled to announce the latest release of Infrahub (0.15).
-This release focuses on enhancing the user experience and laying the groundwork for future features.
+We are thrilled to announce the latest release of Infrahub (0.15.1).
 
 ## Main changes
 
-### Multi profiles
+### Unified storage
 
-#### Frontend update
+### Schema
+
+### Frontend
+
+#### Multi profiles
 
 We can now select multiple profiles when creating and editing an object.
 
 The `profile_priority` value from the profile schema is used to understand which value is used for the fields (the lower the number is, the higher the priority is).
 
-### Generic field for relationship
+#### Generic relationship select fixes
+
+The select for a generic relationship has been fixed to properly reset the value when changing the kind or the parent.
+
+The parent is also not showing "Unknown" after choosing an object.
 
-In the form, if a node has a generic relationship, the parent select is now hidden if it's not available.
+The parent select is also now hidden if it's not available.
 
 It's displayed and available only of the kind selected can point to an object which we can filter depending on its parent.
 
+### Helm Chart
+
+### Infrahub Sync
+
+### Other
+
+### Demo Environment
+
 ## Migration Guide
 
 To migrate your instance of Infrahub to the latest version, please run the following commands and restart all instances of Infrahub.
diff --git a/frontend/app/src/components/form/fields/relationship.field.tsx b/frontend/app/src/components/form/fields/relationship.field.tsx
index 87605b3386..4921adc712 100644
--- a/frontend/app/src/components/form/fields/relationship.field.tsx
+++ b/frontend/app/src/components/form/fields/relationship.field.tsx
@@ -125,6 +125,7 @@ const RelationshipField = ({
                     <RelationshipInput
                       {...field}
                       {...props}
+                      value={undefined}
                       peer={parentRelationship?.peer}
                       disabled={props.disabled || !selectedKind?.id}
                       onChange={setSelectedParent}
@@ -281,15 +282,13 @@ interface RelationshipInputProps extends FormFieldProps, RelationshipFieldProps
 
 // Select parent if needed
 const RelationshipInput = forwardRef<ElementRef<typeof Select>, RelationshipInputProps>(
-  ({ schema, value, options, relationship, ...props }, ref) => {
+  ({ options, relationship, ...props }, ref) => {
     return (
       <Select
         ref={ref}
         {...props}
-        value={value}
         options={options ?? []}
         field={relationship}
-        schema={schema}
         className="w-full"
       />
     );
diff --git a/frontend/app/src/components/inputs/select.tsx b/frontend/app/src/components/inputs/select.tsx
index ce04c35e90..12c159e1a7 100644
--- a/frontend/app/src/components/inputs/select.tsx
+++ b/frontend/app/src/components/inputs/select.tsx
@@ -37,6 +37,7 @@ import { comparedOptions } from "@/utils/array";
 import { getOptionsFromRelationship } from "@/utils/getSchemaObjectColumns";
 import DynamicForm from "@/components/form/dynamic-form";
 import { Badge } from "../ui/badge";
+import usePrevious from "@/hooks/usePrevious";
 
 export type Parent = {
   name?: string;
@@ -124,6 +125,8 @@ export const Select = forwardRef<HTMLDivElement, SelectProps>((props, ref) => {
   const [hasBeenOpened, setHasBeenOpened] = useState(false);
   const [optionToDelete, setOptionToDelete] = useState<null | number | string>(null);
   const [localOptions, setLocalOptions] = useState(options);
+  const previousKind = usePrevious(kind);
+  const previousParent = usePrevious(parent?.value);
 
   const findSelectedOption = () => {
     return multiple
@@ -217,6 +220,12 @@ export const Select = forwardRef<HTMLDivElement, SelectProps>((props, ref) => {
       handleFocus();
     }
 
+    if (!newValue) {
+      setSelectedOption(undefined);
+      if (onChange) onChange(null);
+      return;
+    }
+
     if (newValue.id === addOption.id) {
       setOpen(true);
       return;
@@ -224,7 +233,7 @@ export const Select = forwardRef<HTMLDivElement, SelectProps>((props, ref) => {
 
     if (newValue.id === emptyOption.id) {
       setSelectedOption(emptyOption);
-      onChange(null);
+      if (onChange) onChange(null);
       return;
     }
 
@@ -240,11 +249,11 @@ export const Select = forwardRef<HTMLDivElement, SelectProps>((props, ref) => {
       setSelectedOption(newValue);
 
       if (hasPoolsBeenOpened) {
-        onChange(newValue.map((item) => ({ from_pool: { id: item.id } })));
+        if (onChange) onChange(newValue.map((item) => ({ from_pool: { id: item.id } })));
         return;
       }
 
-      onChange(newValue.map((item) => ({ id: item.id })));
+      if (onChange) onChange(newValue.map((item) => ({ id: item.id })));
       return;
     }
 
@@ -253,16 +262,17 @@ export const Select = forwardRef<HTMLDivElement, SelectProps>((props, ref) => {
     setOpen(false);
 
     if (hasPoolsBeenOpened) {
-      onChange(hasPoolsBeenOpened ? { from_pool: { id: newValue.id } } : { id: newValue.id });
+      if (onChange)
+        onChange(hasPoolsBeenOpened ? { from_pool: { id: newValue.id } } : { id: newValue.id });
       return;
     }
 
     if (dropdown || enumBoolean) {
-      onChange(newValue.id);
+      if (onChange) onChange(newValue.id);
       return;
     }
 
-    onChange({ id: newValue.id });
+    if (onChange) onChange({ id: newValue.id });
   };
 
   const handleCreate = (response: any) => {
@@ -861,6 +871,17 @@ export const Select = forwardRef<HTMLDivElement, SelectProps>((props, ref) => {
     setLocalOptions(options);
   }, [options?.length]);
 
+  // If kind or parent has changed, remove the current value
+  useEffect(() => {
+    if (peer && previousKind && peer !== previousKind) {
+      handleChange(undefined);
+    }
+
+    if (parent?.value && previousParent && parent?.value !== previousParent) {
+      handleChange(undefined);
+    }
+  }, [peer, parent?.value]);
+
   return (
     <div
       className={classNames("relative", dropdown && disabled && "opacity-60", className)}
diff --git a/frontend/app/tests/e2e/objects/artifact.spec.ts b/frontend/app/tests/e2e/objects/artifact.spec.ts
index 79d6eae9a4..f38c084505 100644
--- a/frontend/app/tests/e2e/objects/artifact.spec.ts
+++ b/frontend/app/tests/e2e/objects/artifact.spec.ts
@@ -2,6 +2,8 @@ import { expect, test } from "@playwright/test";
 import { ACCOUNT_STATE_PATH } from "../../constants";
 
 test.describe("/objects/CoreArtifact - Artifact page", () => {
+  test.describe.configure({ mode: "serial" });
+
   test.beforeEach(async function ({ page }) {
     page.on("response", async (response) => {
       if (response.status() === 500) {
diff --git a/frontend/app/tests/e2e/objects/object-update.spec.ts b/frontend/app/tests/e2e/objects/object-update.spec.ts
index 705e8485a8..203430419d 100644
--- a/frontend/app/tests/e2e/objects/object-update.spec.ts
+++ b/frontend/app/tests/e2e/objects/object-update.spec.ts
@@ -108,13 +108,13 @@ test.describe("Object update", () => {
       await page.getByTestId("edit-button").click();
 
       await page.getByTestId("side-panel-container").getByLabel("Status").click();
-      await page.getByText("Empty").click();
+      await page.getByRole("option", { name: "Empty", exact: true }).click();
 
       await page.getByTestId("side-panel-container").getByLabel("Role").click();
-      await page.getByText("Empty").click();
+      await page.getByRole("option", { name: "Empty", exact: true }).click();
 
       await page.getByTestId("side-panel-container").getByLabel("Asn").click();
-      await page.getByText("Empty").click();
+      await page.getByRole("option", { name: "Empty", exact: true }).click();
 
       await page.getByRole("button", { name: "Save" }).click();
     });
diff --git a/frontend/app/tests/e2e/objects/profiles/multi-profiles.spec.ts b/frontend/app/tests/e2e/objects/profiles/multi-profiles.spec.ts
index 9d988152e1..0e673b8ebd 100644
--- a/frontend/app/tests/e2e/objects/profiles/multi-profiles.spec.ts
+++ b/frontend/app/tests/e2e/objects/profiles/multi-profiles.spec.ts
@@ -33,7 +33,7 @@ test.describe("/objects/CoreProfile - Profiles page", () => {
       // L2 profile v1
       await page.getByTestId("create-object-button").click();
       await page.getByLabel("Select an object type").click();
-      await page.getByRole("option", { name: "ProfileInfraInterfaceL2" }).click();
+      await page.getByRole("option", { name: "ProfileInfraInterfaceL2 Profile" }).click();
       await page.getByLabel("Profile Name *").fill("L2 profile v1");
       await page.getByLabel("Description").fill("Desc from L2 profile v1");
       await page.getByRole("button", { name: "Save" }).click();
@@ -44,7 +44,7 @@ test.describe("/objects/CoreProfile - Profiles page", () => {
       // L2 profile v2
       await page.getByTestId("create-object-button").click();
       await page.getByLabel("Select an object type").click();
-      await page.getByRole("option", { name: "ProfileInfraInterfaceL2" }).click();
+      await page.getByRole("option", { name: "ProfileInfraInterfaceL2 Profile" }).click();
       await page.getByLabel("Profile Name *").fill("L2 profile v2");
       await page.getByLabel("Description").fill("Desc from L2 profile v2");
       await page.getByLabel("Profile Priority").fill("10");