diff --git a/apps/dolly-frontend/src/main/js/package-lock.json b/apps/dolly-frontend/src/main/js/package-lock.json
index 8856d18f57e..3d3610b3e88 100644
--- a/apps/dolly-frontend/src/main/js/package-lock.json
+++ b/apps/dolly-frontend/src/main/js/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "dolly",
-  "version": "3.0.27",
+  "version": "3.0.29",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dolly",
-      "version": "3.0.27",
+      "version": "3.0.29",
       "license": "ISC",
       "dependencies": {
         "@grafana/faro-react": "^1.1.2",
@@ -1170,9 +1170,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz",
-      "integrity": "sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==",
+      "version": "9.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz",
+      "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1189,6 +1189,19 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz",
+      "integrity": "sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@floating-ui/core": {
       "version": "1.6.7",
       "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.7.tgz",
@@ -1469,16 +1482,16 @@
       }
     },
     "node_modules/@navikt/aksel-icons": {
-      "version": "6.16.2",
-      "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/6.16.2/9ee0592457a1e1bc8c1990d1aa3a3cf6c9cc4522",
-      "integrity": "sha512-M2rJHEYbHeh9M8smGizRvV6QAj6CAfQMW4vF6zBiNUzV4LfcwgxmwTRM/F5A1lbZScPuFZqAHUey1N3htVl8Cw==",
+      "version": "6.16.3",
+      "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/6.16.3/e0a4e5abf2a0b9ae9b7be68d0f72080832fd8457",
+      "integrity": "sha512-EE5L1F/HGzX1XJ0hQBUJq/wpdoTIs2ii02MxrZ6Ubr50Au9k9gGAUEC+fE+qxTxB8e2aDWlEvOePj1PSP/nMww==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@navikt/ds-css": {
-      "version": "6.16.2",
-      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/6.16.2/6504d11c7905723a585a2c9ba2555fb5a8a159e1",
-      "integrity": "sha512-fWJRierHeHKe718crx8+TmRsKfQ+BODm13oodvt3LIiQmINNNdF7rtAFSO6+yzF6ReVj2bAnqyr+6UqDH9RJyw==",
+      "version": "6.16.3",
+      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/6.16.3/eabc958ee4d9ae6c3510608b5bf21b53ad479e4f",
+      "integrity": "sha512-wq4NHNceTmrXfl9B1GjPypKcpCDNcxhrX+ENfJ/6LJJlHyCKeWZRTtHSr7gprLFQ9hREglJR9Ie8m9xDr4nimA==",
       "dev": true,
       "license": "MIT"
     },
@@ -1500,16 +1513,16 @@
       }
     },
     "node_modules/@navikt/ds-react": {
-      "version": "6.16.2",
-      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/6.16.2/b16cba0f95df6b9e4035099c0dc5b239dcbd5392",
-      "integrity": "sha512-snJnxUXiDN8wmjb3uoELhTfpdsdpftXuZBaZeLsST/skMPJHdym9D8pVjbti4pKrnG2/9zYI2rX/bE2e26D7CQ==",
+      "version": "6.16.3",
+      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/6.16.3/55d1ee7cebf5c9db3e7300cfb81bd60f60347e81",
+      "integrity": "sha512-88dyVXXqNp8NgDjtoBEmuDANaOOt8DCMNqAUMT3/FPdTeFFH42yLqbkYUiSqRC37e3S3vKLbhphZiPQla1SloQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@floating-ui/react": "0.25.4",
         "@floating-ui/react-dom": "^2.0.9",
-        "@navikt/aksel-icons": "^6.16.2",
-        "@navikt/ds-tokens": "^6.16.2",
+        "@navikt/aksel-icons": "^6.16.3",
+        "@navikt/ds-tokens": "^6.16.3",
         "clsx": "^2.1.0",
         "date-fns": "^3.0.0",
         "react-day-picker": "8.10.0"
@@ -1633,9 +1646,9 @@
       }
     },
     "node_modules/@navikt/ds-tokens": {
-      "version": "6.16.2",
-      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/6.16.2/e2f8b1ee8b5125a4497d1baca3b19ac4bd6716e4",
-      "integrity": "sha512-2m1CNuP2Uz3mLBQt5Xb1fKziJTrrMw97E6HgICrUCkm2Vo5ZpzkD1tcS0KSlbz1XMg/q+CheERUIL6kPdj79eQ==",
+      "version": "6.16.3",
+      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/6.16.3/1ce1e16ad2c2386a756e6e6d8a05dcd9564cae9b",
+      "integrity": "sha512-kVIYWf2gSdy4PB+sRbKn1HERep/c6WnCH31DUHLqrcgzGXHG+qcfnS5nEWl9wn10NE+dMlL4+A7B2rPc/3rIzQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -2278,14 +2291,14 @@
       }
     },
     "node_modules/@playwright/experimental-ct-core": {
-      "version": "1.46.1",
-      "resolved": "https://registry.npmjs.org/@playwright/experimental-ct-core/-/experimental-ct-core-1.46.1.tgz",
-      "integrity": "sha512-vmRVmrQZ8mEHCbyrSB/l4hPcz95DCgFY7lCr8jKaY+dresap5WzxgHs2l2c/mNjiS5rFR6BnxKvqhCt0BBIKeA==",
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/@playwright/experimental-ct-core/-/experimental-ct-core-1.47.0.tgz",
+      "integrity": "sha512-IgZBGLREGUqTEXwb8Kh0vEG+/CHHf7EtpivAVoaO8cPzEfZU0LMlyjBaQk0ry5LDD65BZ9DwhTfMYMekAqWXMg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.46.1",
-        "playwright-core": "1.46.1",
+        "playwright": "1.47.0",
+        "playwright-core": "1.47.0",
         "vite": "^5.2.8"
       },
       "engines": {
@@ -2293,13 +2306,13 @@
       }
     },
     "node_modules/@playwright/experimental-ct-react": {
-      "version": "1.46.1",
-      "resolved": "https://registry.npmjs.org/@playwright/experimental-ct-react/-/experimental-ct-react-1.46.1.tgz",
-      "integrity": "sha512-MTOpiVrooq5gMwh0v6OazW4udTbUqVCDQVNX0d20u3+q8Frl9pO522eDHdEQ4bWTOknmyDyTQlXyK6GWlKHjqQ==",
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/@playwright/experimental-ct-react/-/experimental-ct-react-1.47.0.tgz",
+      "integrity": "sha512-GBGfc+NmgdJquyL3XkyhqSROMoyrP4h6Fd77uu/2l/X+xHkb96hmpZ8FyDKEP3Brlm6W0PnTTQUP0FcS5jggAw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@playwright/experimental-ct-core": "1.46.1",
+        "@playwright/experimental-ct-core": "1.47.0",
         "@vitejs/plugin-react": "^4.2.1"
       },
       "bin": {
@@ -2310,13 +2323,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.46.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.46.1.tgz",
-      "integrity": "sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==",
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.47.0.tgz",
+      "integrity": "sha512-SgAdlSwYVpToI4e/IH19IHHWvoijAYH5hu2MWSXptRypLSnzj51PcGD+rsOXFayde4P9ZLi+loXVwArg6IUkCA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.46.1"
+        "playwright": "1.47.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -2651,9 +2664,9 @@
       }
     },
     "node_modules/@rc-component/trigger": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.2.1.tgz",
-      "integrity": "sha512-fuU11J8pOt6+U/tU6/CAv8wjCwGaNeRk9f5k8HQth7JBbJ6MMH62WhGycVW75VnXfBZgL/7kO+wbiO2Xc9U9sQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.2.3.tgz",
+      "integrity": "sha512-X1oFIpKoXAMXNDYCviOmTfuNuYxE4h5laBsyCqVAVMjNHxoF3/uiyA7XdegK1XbCvBbCZ6P6byWrEoDRpKL8+A==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.23.2",
@@ -2711,9 +2724,9 @@
       }
     },
     "node_modules/@remix-run/router": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.1.tgz",
-      "integrity": "sha512-S45oynt/WH19bHbIXjtli6QmwNYvaz+vtnubvNpNDvUOoA/OWh6j1OikIP3G+v5GHdxyC6EXoChG3HgYGEUfcg==",
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.2.tgz",
+      "integrity": "sha512-baiMx18+IMuD1yyvOGaHM9QrVUPGGG0jC+z+IPHnRJWUAUvaKuWKyE8gjDj2rzv3sz9zOGoRSPgeBVHRhZnBlA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
@@ -3064,9 +3077,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.5.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.2.tgz",
-      "integrity": "sha512-acJsPTEqYqulZS/Yp/S3GgeE6GZ0qYODUR8aVr/DkhHQ8l9nd4j5x1/ZJy9/gHrRlFMqkO6i0I3E27Alu4jjPg==",
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.2"
@@ -3257,17 +3270,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.3.0.tgz",
-      "integrity": "sha512-FLAIn63G5KH+adZosDYiutqkOkYEx0nvcwNNfJAf+c7Ae/H35qWwTYvPZUKFj5AS+WfHG/WJJfWnDnyNUlp8UA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.5.0.tgz",
+      "integrity": "sha512-lHS5hvz33iUFQKuPFGheAB84LwcJ60G8vKnEhnfcK1l8kGVLro2SFYW6K0/tj8FUhRJ0VHyg1oAfg50QGbPPHw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.3.0",
-        "@typescript-eslint/type-utils": "8.3.0",
-        "@typescript-eslint/utils": "8.3.0",
-        "@typescript-eslint/visitor-keys": "8.3.0",
+        "@typescript-eslint/scope-manager": "8.5.0",
+        "@typescript-eslint/type-utils": "8.5.0",
+        "@typescript-eslint/utils": "8.5.0",
+        "@typescript-eslint/visitor-keys": "8.5.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -3291,16 +3304,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.3.0.tgz",
-      "integrity": "sha512-h53RhVyLu6AtpUzVCYLPhZGL5jzTD9fZL+SYf/+hYOx2bDkyQXztXSc4tbvKYHzfMXExMLiL9CWqJmVz6+78IQ==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.5.0.tgz",
+      "integrity": "sha512-gF77eNv0Xz2UJg/NbpWJ0kqAm35UMsvZf1GHj8D9MRFTj/V3tAciIWXfmPLsAAF/vUlpWPvUDyH1jjsr0cMVWw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.3.0",
-        "@typescript-eslint/types": "8.3.0",
-        "@typescript-eslint/typescript-estree": "8.3.0",
-        "@typescript-eslint/visitor-keys": "8.3.0",
+        "@typescript-eslint/scope-manager": "8.5.0",
+        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/typescript-estree": "8.5.0",
+        "@typescript-eslint/visitor-keys": "8.5.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3320,14 +3333,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.3.0.tgz",
-      "integrity": "sha512-mz2X8WcN2nVu5Hodku+IR8GgCOl4C0G/Z1ruaWN4dgec64kDBabuXyPAr+/RgJtumv8EEkqIzf3X2U5DUKB2eg==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz",
+      "integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.3.0",
-        "@typescript-eslint/visitor-keys": "8.3.0"
+        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/visitor-keys": "8.5.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3338,14 +3351,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.3.0.tgz",
-      "integrity": "sha512-wrV6qh//nLbfXZQoj32EXKmwHf4b7L+xXLrP3FZ0GOUU72gSvLjeWUl5J5Ue5IwRxIV1TfF73j/eaBapxx99Lg==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.5.0.tgz",
+      "integrity": "sha512-N1K8Ix+lUM+cIDhL2uekVn/ZD7TZW+9/rwz8DclQpcQ9rk4sIL5CAlBC0CugWKREmDjBzI/kQqU4wkg46jWLYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.3.0",
-        "@typescript-eslint/utils": "8.3.0",
+        "@typescript-eslint/typescript-estree": "8.5.0",
+        "@typescript-eslint/utils": "8.5.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -3363,9 +3376,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.3.0.tgz",
-      "integrity": "sha512-y6sSEeK+facMaAyixM36dQ5NVXTnKWunfD1Ft4xraYqxP0lC0POJmIaL/mw72CUMqjY9qfyVfXafMeaUj0noWw==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz",
+      "integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3377,14 +3390,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.3.0.tgz",
-      "integrity": "sha512-Mq7FTHl0R36EmWlCJWojIC1qn/ZWo2YiWYc1XVtasJ7FIgjo0MVv9rZWXEE7IK2CGrtwe1dVOxWwqXUdNgfRCA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz",
+      "integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "8.3.0",
-        "@typescript-eslint/visitor-keys": "8.3.0",
+        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/visitor-keys": "8.5.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -3406,16 +3419,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.3.0.tgz",
-      "integrity": "sha512-F77WwqxIi/qGkIGOGXNBLV7nykwfjLsdauRB/DOFPdv6LTF3BHHkBpq81/b5iMPSF055oO2BiivDJV4ChvNtXA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz",
+      "integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.3.0",
-        "@typescript-eslint/types": "8.3.0",
-        "@typescript-eslint/typescript-estree": "8.3.0"
+        "@typescript-eslint/scope-manager": "8.5.0",
+        "@typescript-eslint/types": "8.5.0",
+        "@typescript-eslint/typescript-estree": "8.5.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3429,13 +3442,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.3.0.tgz",
-      "integrity": "sha512-RmZwrTbQ9QveF15m/Cl28n0LXD6ea2CjkhH5rQ55ewz3H24w+AMCJHPVYaZ8/0HoG8Z3cLLFFycRXxeO2tz9FA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz",
+      "integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.3.0",
+        "@typescript-eslint/types": "8.5.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -3512,9 +3525,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
-      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3985,9 +3998,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001655",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
-      "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
+      "version": "1.0.30001660",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
+      "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
       "dev": true,
       "funding": [
         {
@@ -4116,9 +4129,9 @@
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.0.tgz",
-      "integrity": "sha512-N1NGmowPlGBLsOZLPvm48StN04V4YvQRL0i6b7ctrVY3epjP/ct7hFLOItz6pDIvRjwpfPxi52a2UWV2ziir8g==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
+      "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
       "license": "MIT"
     },
     "node_modules/classnames": {
@@ -4422,12 +4435,12 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -4583,9 +4596,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.13",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
-      "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==",
+      "version": "1.5.20",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.20.tgz",
+      "integrity": "sha512-74mdl6Fs1HHzK9SUX4CKFxAtAe3nUns48y79TskHNAG6fGOlLfyKA4j855x+0b5u8rWJIrlaG9tcTPstMlwjIw==",
       "dev": true,
       "license": "ISC"
     },
@@ -4854,9 +4867,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.9.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz",
-      "integrity": "sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==",
+      "version": "9.10.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.10.0.tgz",
+      "integrity": "sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4864,7 +4877,8 @@
         "@eslint-community/regexpp": "^4.11.0",
         "@eslint/config-array": "^0.18.0",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.9.1",
+        "@eslint/js": "9.10.0",
+        "@eslint/plugin-kit": "^0.1.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.3.0",
         "@nodelib/fs.walk": "^1.2.8",
@@ -4887,7 +4901,6 @@
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
@@ -4927,9 +4940,9 @@
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.35.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz",
-      "integrity": "sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==",
+      "version": "7.35.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.2.tgz",
+      "integrity": "sha512-Rbj2R9zwP2GYNcIak4xoAMV57hrBh3hTaR0k7hVjwCQgryE/pw5px4b13EYjduOI0hfXyZhwBxaGpOTbWSGzKQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5407,9 +5420,9 @@
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "funding": [
         {
           "type": "individual",
@@ -7195,9 +7208,9 @@
       "license": "MIT"
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "license": "MIT"
     },
     "node_modules/nan": {
@@ -7641,9 +7654,9 @@
       }
     },
     "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
       "license": "ISC"
     },
     "node_modules/picomatch": {
@@ -7671,13 +7684,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.46.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.1.tgz",
-      "integrity": "sha512-oPcr1yqoXLCkgKtD5eNUPLiN40rYEM39odNpIb6VE6S7/15gJmA1NzVv6zJYusV0e7tzvkU/utBFNa/Kpxmwng==",
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.0.tgz",
+      "integrity": "sha512-jOWiRq2pdNAX/mwLiwFYnPHpEZ4rM+fRSQpRHwEwZlP2PUANvL3+aJOF/bvISMhFD30rqMxUB4RJx9aQbfh4Ww==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.46.1"
+        "playwright-core": "1.47.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -7690,9 +7703,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.46.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.46.1.tgz",
-      "integrity": "sha512-h9LqIQaAv+CYvWzsZ+h3RsrqCStkBHlgo6/TJlFst3cOTlLghBQlJwPOZKQJTKNaD3QIB7aAVQ+gfWbN3NXB7A==",
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.0.tgz",
+      "integrity": "sha512-1DyHT8OqkcfCkYUD9zzUTfg7EfTd+6a8MkD/NWOvjo0u/SCNd5YmY/lJwFvUZOxJbWNds+ei7ic2+R/cRz/PDg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -8272,12 +8285,12 @@
       }
     },
     "node_modules/react-router": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.1.tgz",
-      "integrity": "sha512-kIwJveZNwp7teQRI5QmwWo39A5bXRyqpH0COKKmPnyD2vBvDwgFXSqDUYtt1h+FEyfnE8eXr7oe0MxRzVwCcvQ==",
+      "version": "6.26.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.2.tgz",
+      "integrity": "sha512-tvN1iuT03kHgOFnLPfLJ8V95eijteveqdOSk+srqfePtQvqCExB8eHOYnlilbOcyJyKnYkr1vJvf7YqotAJu1A==",
       "license": "MIT",
       "dependencies": {
-        "@remix-run/router": "1.19.1"
+        "@remix-run/router": "1.19.2"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -8287,13 +8300,13 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.26.1.tgz",
-      "integrity": "sha512-veut7m41S1fLql4pLhxeSW3jlqs+4MtjRLj0xvuCEXsxusJCbs6I8yn9BxzzDX2XDgafrccY6hwjmd/bL54tFw==",
+      "version": "6.26.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.26.2.tgz",
+      "integrity": "sha512-z7YkaEW0Dy35T3/QKPYB1LjMK2R1fxnHO8kWpUMTBdfVzZrWOiY9a7CtN8HqdWtDUWd5FY6Dl8HFsqVwH4uOtQ==",
       "license": "MIT",
       "dependencies": {
-        "@remix-run/router": "1.19.1",
-        "react-router": "6.26.1"
+        "@remix-run/router": "1.19.2",
+        "react-router": "6.26.2"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -8813,9 +8826,9 @@
       "optional": true
     },
     "node_modules/sass": {
-      "version": "1.77.8",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz",
-      "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==",
+      "version": "1.78.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.78.0.tgz",
+      "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9035,9 +9048,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -9586,9 +9599,9 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.0.tgz",
-      "integrity": "sha512-OduNjVJsFbifKb57UqZ2EMP1i4u64Xwow3NYXUtBbD4vIwJdQd4+xl8YDou1dlm4DVrtwT/7Ky8z8WyCULVfxw==",
+      "version": "4.26.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
+      "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -9676,9 +9689,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
+      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -9838,14 +9851,14 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz",
-      "integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==",
+      "version": "5.4.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.4.tgz",
+      "integrity": "sha512-RHFCkULitycHVTtelJ6jQLd+KSAAzOgEYorV32R2q++M6COBjKJR6BxqClwp5sf0XaBDjVMuJ9wnNfyAJwjMkA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.21.3",
-        "postcss": "^8.4.41",
+        "postcss": "^8.4.43",
         "rollup": "^4.20.0"
       },
       "bin": {
@@ -9943,9 +9956,9 @@
       }
     },
     "node_modules/vite/node_modules/postcss": {
-      "version": "8.4.43",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.43.tgz",
-      "integrity": "sha512-gJAQVYbh5R3gYm33FijzCZj7CHyQ3hWMgJMprLUlIYqCwTeZhBQ19wp0e9mA25BUbEvY5+EXuuaAjqQsrBxQBQ==",
+      "version": "8.4.45",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
+      "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
       "dev": true,
       "funding": [
         {
diff --git a/apps/dolly-frontend/src/main/js/package.json b/apps/dolly-frontend/src/main/js/package.json
index 625d4fd102f..cdd84c95752 100644
--- a/apps/dolly-frontend/src/main/js/package.json
+++ b/apps/dolly-frontend/src/main/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dolly",
-  "version": "3.0.27",
+  "version": "3.0.29",
   "type": "module",
   "description": "",
   "main": "index.js",
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx
index ce79b767d04..7042298f35d 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx
@@ -26,6 +26,10 @@ import { DollyValidation } from './steg/steg2/DollyValidation'
 
 const STEPS = [Steg1, Steg2, Steg3]
 
+export const devEnabled =
+	window.location.hostname.includes('localhost') ||
+	window.location.hostname.includes('dolly-frontend-dev')
+
 export const StegVelger = ({ initialValues, onSubmit }) => {
 	const context = useContext(BestillingsveilederContext)
 	const errorContext: ShowErrorContextType = useContext(ShowErrorContext)
@@ -81,10 +85,6 @@ export const StegVelger = ({ initialValues, onSubmit }) => {
 
 	const labels = STEPS.map((v) => ({ label: v.label }))
 
-	const devEnabled =
-		window.location.hostname.includes('localhost') ||
-		window.location.hostname.includes('dolly-frontend-dev')
-
 	return (
 		<FormProvider {...formMethods}>
 			<Stepper orientation="horizontal" activeStep={step + 1}>
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/PdlTypes.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/PdlTypes.tsx
index d90181053df..3096e952a99 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/PdlTypes.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/PdlTypes.tsx
@@ -174,7 +174,7 @@ export type VergemaalValues = {
 	sakType?: string
 	gyldigFraOgMed: string
 	gyldigTilOgMed: string
-	nyVergeIdent?: NyIdent
+	nyVergeIdent?: NyIdent | undefined
 	vergeIdent?: string
 	id: number
 }
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx
index b78ac7cc89b..d0bb443b547 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx
@@ -29,7 +29,7 @@ export const getInitialKontaktadresse = (master = 'FREG') => ({
 	adressetype: null as unknown as string,
 	gyldigFraOgMed: null as unknown as string,
 	gyldigTilOgMed: null as unknown as string,
-	opprettCoAdresseNavn: null as object,
+	opprettCoAdresseNavn: null as unknown as object,
 	kilde: 'Dolly',
 	master: master,
 })
@@ -95,8 +95,6 @@ export const initialUkjentBosted = {
 	bostedskommune: null as unknown as string,
 }
 
-export const initialOppholdAnnetSted = null as unknown as string
-
 export const initialKontaktinfoForDoedebo = {
 	skifteform: null as unknown as string,
 	attestutstedelsesdato: null as unknown as string,
@@ -226,7 +224,7 @@ export const initialOrganisasjon = {
 export const initialPerson = {
 	identifikasjonsnummer: null as unknown as string,
 	foedselsdato: null as unknown as string,
-	navn: null as typeof navn,
+	navn: null as unknown as typeof navn,
 }
 
 export const initialNyPerson = {
@@ -287,7 +285,7 @@ export const initialVergemaal = {
 	sakType: null as unknown as string,
 	gyldigFraOgMed: null as unknown as string,
 	gyldigTilOgMed: null as unknown as string,
-	nyVergeIdent: initialPdlPerson,
+	nyVergeIdent: initialPdlPerson as unknown,
 	vergeIdent: null as unknown as string,
 	mandatType: null as unknown as string,
 	kilde: 'Dolly',
@@ -338,21 +336,6 @@ export const getInitialUtenlandskIdentifikasjonsnummer = (master = 'FREG') => ({
 	master: master,
 })
 
-export const initialNyIdent = {
-	eksisterendeIdent: null as unknown as string,
-	identtype: null as unknown as string,
-	kjoenn: null as unknown as string,
-	foedtEtter: null as unknown as string,
-	foedtFoer: null as unknown as string,
-	alder: '',
-	syntetisk: true,
-	nyttNavn: {
-		hasMellomnavn: false,
-	},
-	kilde: 'Dolly',
-	master: 'FREG',
-}
-
 export const getInitialNyIdent = (master = 'FREG') => ({
 	eksisterendeIdent: null as unknown as string,
 	identtype: null as unknown as string,
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/sivilstand/Sivilstand.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/sivilstand/Sivilstand.tsx
index 9f2722838c3..10100fbaf9d 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/sivilstand/Sivilstand.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/sivilstand/Sivilstand.tsx
@@ -101,6 +101,7 @@ export const SivilstandForm = ({
 			/>
 			{kanHaRelatertPerson && (
 				<PdlPersonExpander
+					path={path}
 					nyPersonPath={`${path}.nyRelatertPerson`}
 					eksisterendePersonPath={`${path}.relatertVedSivilstand`}
 					eksisterendeNyPerson={eksisterendeNyPerson}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/fullmakt/Fullmakt.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/fullmakt/Fullmakt.tsx
index a788146f080..4b7ba8d71b4 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/fullmakt/Fullmakt.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/fullmakt/Fullmakt.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react'
+import { useContext } from 'react'
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
 import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
 import { SelectOptionsOppslag } from '@/service/SelectOptionsOppslag'
@@ -9,7 +10,6 @@ import { initialFullmakt } from '@/components/fagsystem/pdlf/form/initialValues'
 import { isEmpty } from '@/components/fagsystem/pdlf/form/partials/utils'
 import { SelectOptionsFormat } from '@/service/SelectOptionsFormat'
 import { UseFormReturn } from 'react-hook-form/dist/types'
-import { useContext } from 'react'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
 
 interface FullmaktProps {
@@ -40,6 +40,7 @@ export const FullmaktForm = ({ formMethods, path, eksisterendeNyPerson = null }:
 			<FormDatepicker name={`${path}.gyldigFraOgMed`} label="Gyldig fra og med" />
 			<FormDatepicker name={`${path}.gyldigTilOgMed`} label="Gyldig til og med" />
 			<PdlPersonExpander
+				path={path}
 				nyPersonPath={`${path}.nyFullmektig`}
 				eksisterendePersonPath={`${path}.motpartsPersonident`}
 				label={'FULLMEKTIG'}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/nyIdent/nyIdent.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/nyIdent/nyIdent.tsx
index f91fc9c4b28..b1ce98a1632 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/nyIdent/nyIdent.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/nyIdent/nyIdent.tsx
@@ -33,6 +33,7 @@ export const NyIdent = ({ formMethods }: NyIdentForm) => {
 				return (
 					<div className="flexbox--flex-wrap">
 						<PdlPersonExpander
+							path={path}
 							nyPersonPath={path}
 							eksisterendePersonPath={`${path}.eksisterendeIdent`}
 							label="NY IDENTITET"
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlNyPerson.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlNyPerson.tsx
index 9ccfaa0a90b..a54d6c1eb8a 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlNyPerson.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlNyPerson.tsx
@@ -105,6 +105,7 @@ export const PdlNyPerson = ({
 					label="Gradering"
 					options={Options('gradering')}
 					isDisabled={hasEksisterendePerson}
+					size={'large'}
 				/>
 			)}
 			<FormCheckbox
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx
index 8b0fdec9da2..533ccfeb7fa 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx
@@ -7,6 +7,7 @@ import { Option } from '@/service/SelectOptionsOppslag'
 import { UseFormReturn } from 'react-hook-form/dist/types'
 
 interface PdlPersonValues {
+	path: string
 	nyPersonPath: string
 	eksisterendePersonPath: string
 	eksisterendeNyPerson?: Option
@@ -18,6 +19,7 @@ interface PdlPersonValues {
 }
 
 export const PdlPersonExpander = ({
+	path,
 	nyPersonPath,
 	eksisterendePersonPath,
 	eksisterendeNyPerson = null,
@@ -50,6 +52,7 @@ export const PdlPersonExpander = ({
 				))}
 			{visPersonValg && (
 				<PdlPersonForm
+					path={path}
 					nyPersonPath={nyPersonPath}
 					eksisterendePersonPath={eksisterendePersonPath}
 					label={label}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonForm.tsx
index d3df7851531..2768252f52c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonForm.tsx
@@ -6,10 +6,15 @@ import { DollyApi } from '@/service/Api'
 import { useAsync } from 'react-use'
 import { Option } from '@/service/SelectOptionsOppslag'
 import { UseFormReturn } from 'react-hook-form/dist/types'
-import { useContext } from 'react'
+import { useContext, useEffect, useState } from 'react'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
+import { ToggleGroup } from '@navikt/ds-react'
+import Icon from '@/components/ui/icon/Icon'
+import styled from 'styled-components'
+import { initialPdlPerson } from '@/components/fagsystem/pdlf/form/initialValues'
 
 interface PdlPersonValues {
+	path: string
 	nyPersonPath: string
 	eksisterendePersonPath: string
 	label: string
@@ -18,7 +23,27 @@ interface PdlPersonValues {
 	eksisterendeNyPerson?: Option
 }
 
+const StyledToggleGroup = styled(ToggleGroup)`
+	&&&& {
+		div {
+			background-color: #ffffff;
+		}
+
+		button {
+			margin-right: unset;
+		}
+	}
+
+	margin: 5px 0;
+`
+
+const PersonType = {
+	NY_PERSON: 'nyPerson',
+	EKSISTERENDE_PERSON: 'eksisterendePerson',
+}
+
 export const PdlPersonForm = ({
+	path,
 	nyPersonPath,
 	eksisterendePersonPath,
 	label,
@@ -31,24 +56,62 @@ export const PdlPersonForm = ({
 		return await DollyApi.getGruppeById(gruppeId)
 	}, [])
 	//@ts-ignore
-	const gruppeIdenter = gruppe?.value?.data?.identer?.map((person) => person.ident)
 	const opts: any = useContext(BestillingsveilederContext)
+	const [type, setType] = useState(
+		formMethods.watch(eksisterendePersonPath)
+			? PersonType.EKSISTERENDE_PERSON
+			: PersonType.NY_PERSON,
+	)
+
+	const gruppeIdenter = gruppe?.value?.data?.identer?.map((person) => person.ident)
 
 	const isTestnorgeIdent = opts?.identMaster === 'PDL'
 
+	useEffect(() => {
+		formMethods.setValue(nyPersonPath, type === PersonType.NY_PERSON ? initialPdlPerson : undefined)
+		formMethods.setValue(
+			eksisterendePersonPath,
+			type === PersonType.EKSISTERENDE_PERSON ? eksisterendeNyPerson?.value : undefined,
+		)
+		formMethods.setValue(`${path}.eksisterendePerson`, type === PersonType.EKSISTERENDE_PERSON)
+		formMethods.trigger()
+	}, [type])
+
 	return (
 		<>
 			{!isTestnorgeIdent && (
 				<>
-					<h4>Opprett ny person</h4>
-					<PdlNyPerson
-						nyPersonPath={nyPersonPath}
-						eksisterendePersonPath={eksisterendePersonPath}
-						formMethods={formMethods}
-						erNyIdent={nyIdentValg !== null}
-						gruppeIdenter={gruppeIdenter}
-						eksisterendeNyPerson={eksisterendeNyPerson}
-					/>
+					<StyledToggleGroup size={'small'} value={type} onChange={setType} label={'Personvalg'}>
+						<ToggleGroup.Item key={PersonType.NY_PERSON} value={PersonType.NY_PERSON}>
+							<Icon
+								key={PersonType.NY_PERSON}
+								size={13}
+								kind={type === PersonType.NY_PERSON ? 'person-plus' : 'person-plus-fill'}
+							/>
+							{'Opprett ny person'}
+						</ToggleGroup.Item>
+						<ToggleGroup.Item
+							key={PersonType.EKSISTERENDE_PERSON}
+							value={PersonType.EKSISTERENDE_PERSON}
+						>
+							<Icon
+								key={PersonType.EKSISTERENDE_PERSON}
+								size={13}
+								kind={type === PersonType.EKSISTERENDE_PERSON ? 'person' : 'person-fill'}
+							/>
+							{'Velg eksisterende person'}
+						</ToggleGroup.Item>
+					</StyledToggleGroup>
+					{type === PersonType.NY_PERSON && (
+						<PdlNyPerson
+							nyPersonPath={nyPersonPath}
+							eksisterendePersonPath={eksisterendePersonPath}
+							formMethods={formMethods}
+							erNyIdent={nyIdentValg !== null}
+							gruppeIdenter={gruppeIdenter}
+							eksisterendeNyPerson={eksisterendeNyPerson}
+						/>
+					)}
 				</>
 			)}
 			<>
@@ -58,16 +121,17 @@ export const PdlPersonForm = ({
 							(opts?.antall > 1 && 'Valg er kun tilgjengelig for individ, ikke for gruppe') || ''
 						}
 					>
-						<h4>Velg eksisterende person</h4>
-						<PdlEksisterendePerson
-							nyPersonPath={nyPersonPath}
-							eksisterendePersonPath={eksisterendePersonPath}
-							label={label}
-							formMethods={formMethods}
-							nyIdentValg={nyIdentValg}
-							eksisterendeNyPerson={eksisterendeNyPerson}
-							disabled={opts?.antall > 1}
-						/>
+						{type === PersonType.EKSISTERENDE_PERSON && (
+							<PdlEksisterendePerson
+								nyPersonPath={nyPersonPath}
+								eksisterendePersonPath={eksisterendePersonPath}
+								label={label}
+								formMethods={formMethods}
+								nyIdentValg={nyIdentValg}
+								eksisterendeNyPerson={eksisterendeNyPerson}
+								disabled={opts?.antall > 1}
+							/>
+						)}
 					</div>
 				}
 			</>
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/vergemaal/Vergemaal.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/vergemaal/Vergemaal.tsx
index 277997c2b51..b8514305b59 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/vergemaal/Vergemaal.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/vergemaal/Vergemaal.tsx
@@ -45,6 +45,7 @@ export const VergemaalForm = ({
 			<FormDatepicker name={`${path}.gyldigFraOgMed`} label="Gyldig f.o.m." />
 			<FormDatepicker name={`${path}.gyldigTilOgMed`} label="Gyldig t.o.m." />
 			<PdlPersonExpander
+				path={path}
 				nyPersonPath={`${path}.nyVergeIdent`}
 				eksisterendePersonPath={`${path}.vergeIdent`}
 				eksisterendeNyPerson={eksisterendeNyPerson}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx
index 1ad1c8ded16..b7da27f8235 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx
@@ -123,7 +123,6 @@ const VergemaalVisning = ({
 }: VergemaalVisningTypes) => {
 	const initVergemaal = Object.assign(_.cloneDeep(initialVergemaal), data[idx])
 	let initialValues = { vergemaal: initVergemaal }
-	initialValues.vergemaal.nyVergeIdent = initialPdlPerson
 
 	const redigertVergemaalPdlf = _.get(tmpPersoner, `${ident}.person.vergemaal`)?.find(
 		(a: VergemaalValues) => a.id === vergemaalData.id,
@@ -136,6 +135,9 @@ const VergemaalVisning = ({
 	}
 
 	const vergemaalValues = redigertVergemaalPdlf ? redigertVergemaalPdlf : vergemaalData
+
+	initialValues.vergemaal.nyVergeIdent = initialPdlPerson
+
 	let redigertVergemaalValues = redigertVergemaalPdlf
 		? {
 				vergemaal: Object.assign(_.cloneDeep(initialVergemaal), redigertVergemaalPdlf),
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx
index b693ca97164..6bf00a11063 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx
@@ -39,9 +39,11 @@ import { Form, FormProvider, useForm } from 'react-hook-form'
 import { visningRedigerbarValidation } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarValidation'
 import { yupResolver } from '@hookform/resolvers/yup'
 import './VisningRedigerbarForm.less'
-import { boolean } from 'yup'
 import { FoedestedForm } from '@/components/fagsystem/pdlf/form/partials/foedsel/Foedested'
 import { FoedselsdatoForm } from '@/components/fagsystem/pdlf/form/partials/foedsel/Foedselsdato'
+import DisplayFormState from '@/utils/DisplayFormState'
+import DisplayFormErrors from '@/utils/DisplayFormErrors'
+import { devEnabled } from '@/components/bestillingsveileder/stegVelger/StegVelger'
 
 type VisningTypes = {
 	getPdlForvalter: Function
@@ -51,6 +53,7 @@ type VisningTypes = {
 	redigertAttributt?: any
 	path: string
 	ident: string
+	identMaster?: string
 	identtype?: string
 	disableSlett?: boolean
 	personFoerLeggTil?: any
@@ -121,7 +124,7 @@ export const VisningRedigerbar = ({
 	path,
 	ident,
 	identtype,
-	identMaster = boolean,
+	identMaster = '',
 	disableSlett = false,
 	personValues = null,
 	relasjoner = null,
@@ -151,7 +154,7 @@ export const VisningRedigerbar = ({
 
 	const sendData = (data) => {
 		const id = _.get(data, `${path}.id`)
-		const itemData = _.get(data, path)
+		const itemData = formMethods.watch(path)
 		return PdlforvalterApi.putAttributt(ident, path?.toLowerCase(), id, itemData)
 			.catch((error: Error) => {
 				pdlfError(error)
@@ -400,8 +403,18 @@ export const VisningRedigerbar = ({
 					</>
 				)}
 				{visningModus === Modus.Skriv && (
-					<Form onSubmit={(data) => handleSubmit(data?.data)}>
+					<Form
+						onSubmit={(data) => {
+							return handleSubmit(data?.data)
+						}}
+					>
 						<>
+							{devEnabled && (
+								<>
+									<DisplayFormState />
+									<DisplayFormErrors errors={formMethods.formState.errors} label={'Vis errors'} />
+								</>
+							)}
 							<FieldArrayEdit>
 								<div className="flexbox--flex-wrap visning-redigerbar-form">
 									{getForm(formMethods)}
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/icon/Icon.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/icon/Icon.tsx
index f87447e9516..fbed5ad5a54 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/icon/Icon.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/icon/Icon.tsx
@@ -44,9 +44,11 @@ import {
 	PadlockLockedIcon,
 	PencilIcon,
 	PersonCircleIcon,
+	PersonFillIcon,
 	PersonGroupFillIcon,
 	PersonGroupIcon,
 	PersonIcon,
+	PersonPlusFillIcon,
 	PersonPlusIcon,
 	PersonTallShortIcon,
 	PhoneIcon,
@@ -113,12 +115,14 @@ export const icons = {
 	'thumbs-down': ThumbDownFillIcon,
 	lock: PadlockLockedIcon,
 	logout: LeaveIcon,
-
 	man: FigureInwardIcon,
 	'man-light': FigureInwardIcon,
 	'man-silhouette': SilhouetteIcon,
 	woman: FigureOutwardIcon,
 	person: PersonIcon,
+	'person-fill': PersonFillIcon,
+	'person-plus': PersonPlusIcon,
+	'person-plus-fill': PersonPlusFillIcon,
 	ukjent: SilhouetteIcon,
 	group: PersonGroupIcon,
 	'group-light': PersonGroupIcon,
diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java
index 45f34416ff3..d4f60c563e8 100644
--- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java
+++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java
@@ -10,4 +10,4 @@ public static void main(String[] args) {
 
         SpringApplication.run(PdlForvalterApplicationStarter.class, args);
     }
-}
+}
\ No newline at end of file
diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java
index ebbe33e19c5..12655496b07 100644
--- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java
+++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/ArtifactUpdateService.java
@@ -92,46 +92,6 @@ public class ArtifactUpdateService {
     private final UtflyttingService utflyttingService;
     private final VergemaalService vergemaalService;
 
-    private static <T extends DbVersjonDTO> void checkExists(List<T> artifacter, Integer id, String navn) {
-
-        if (artifacter.stream().noneMatch(artifact -> artifact.getId().equals(id))) {
-            throw new NotFoundException(String.format(INFO_NOT_FOUND, navn, id));
-        }
-    }
-
-    private static <T extends DbVersjonDTO> T initOpprett(List<T> artifacter, T oppretting) {
-
-        oppretting.setId(artifacter.stream()
-                .mapToInt(DbVersjonDTO::getId)
-                .max().orElse(0) + 1);
-        return oppretting;
-    }
-
-    private <T extends DbVersjonDTO> List<T> updateArtifact(List<T> artifacter, T artifact,
-                                                            Integer id, String navn) {
-
-        artifact.setIsNew(true);
-        artifact.setKilde(isNotBlank(artifact.getKilde()) ? artifact.getKilde() : "Dolly");
-        artifact.setMaster(nonNull(artifact.getMaster()) ? artifact.getMaster() : DbVersjonDTO.Master.FREG);
-
-        if (id.equals(0)) {
-            artifacter.addFirst(initOpprett(artifacter, artifact));
-            return artifacter;
-
-        } else {
-            checkExists(artifacter, id, navn);
-            return new ArrayList<>(artifacter.stream()
-                    .map(data -> {
-                        if (data.getId().equals(id)) {
-                            artifact.setId(id);
-                            return artifact;
-                        }
-                        return data;
-                    })
-                    .toList());
-        }
-    }
-
     public void updateFoedsel(String ident, Integer id, FoedselDTO oppdatertFoedsel) {
 
         var person = getPerson(ident);
@@ -299,12 +259,6 @@ public void updateForelderBarnRelasjon(String ident, Integer id, ForelderBarnRel
         }
     }
 
-    private static boolean isEndretRolle(ForelderBarnRelasjonDTO relasjon, ForelderBarnRelasjonDTO oppdatertRelasjon) {
-
-        return oppdatertRelasjon.getMinRolleForPerson() != relasjon.getMinRolleForPerson() &&
-                oppdatertRelasjon.getRelatertPersonsRolle() != relasjon.getRelatertPersonsRolle();
-    }
-
     public void updateForeldreansvar(String ident, Integer id, ForeldreansvarDTO oppdatertAnsvar) {
 
         var person = getPerson(ident);
@@ -625,7 +579,6 @@ public void updateVergemaal(String ident, Integer id, VergemaalDTO oppdatertVerg
                 deletePerson(slettePerson, vergemaal.isEksisterendePerson());
 
                 oppdatertVergemaal.setId(id);
-                oppdatertVergemaal.setVergeIdent(null);
                 person.getPerson().getVergemaal().add(oppdatertVergemaal);
                 person.getPerson().getVergemaal().sort(Comparator.comparing(VergemaalDTO::getId).reversed());
             }
@@ -662,6 +615,31 @@ public void updateDoedfoedtBarn(String ident, Integer id, DoedfoedtBarnDTO oppda
         doedfoedtBarnService.convert(person.getPerson().getDoedfoedtBarn());
     }
 
+    private <T extends DbVersjonDTO> List<T> updateArtifact(List<T> artifacter, T artifact,
+                                                            Integer id, String navn) {
+
+        artifact.setIsNew(true);
+        artifact.setKilde(isNotBlank(artifact.getKilde()) ? artifact.getKilde() : "Dolly");
+        artifact.setMaster(nonNull(artifact.getMaster()) ? artifact.getMaster() : DbVersjonDTO.Master.FREG);
+
+        if (id.equals(0)) {
+            artifacter.addFirst(initOpprett(artifacter, artifact));
+            return artifacter;
+
+        } else {
+            checkExists(artifacter, id, navn);
+            return new ArrayList<>(artifacter.stream()
+                    .map(data -> {
+                        if (data.getId().equals(id)) {
+                            artifact.setId(id);
+                            return artifact;
+                        }
+                        return data;
+                    })
+                    .toList());
+        }
+    }
+
     private DbPerson getPerson(String ident) {
 
         return personRepository.findByIdent(ident)
@@ -675,4 +653,25 @@ private void deletePerson(DbPerson person, boolean isEksisterendePerson) {
             personService.deletePerson(person.getIdent());
         }
     }
+
+    private static <T extends DbVersjonDTO> void checkExists(List<T> artifacter, Integer id, String navn) {
+
+        if (artifacter.stream().noneMatch(artifact -> artifact.getId().equals(id))) {
+            throw new NotFoundException(String.format(INFO_NOT_FOUND, navn, id));
+        }
+    }
+
+    private static <T extends DbVersjonDTO> T initOpprett(List<T> artifacter, T oppretting) {
+
+        oppretting.setId(artifacter.stream()
+                .mapToInt(DbVersjonDTO::getId)
+                .max().orElse(0) + 1);
+        return oppretting;
+    }
+
+    private static boolean isEndretRolle(ForelderBarnRelasjonDTO relasjon, ForelderBarnRelasjonDTO oppdatertRelasjon) {
+
+        return oppdatertRelasjon.getMinRolleForPerson() != relasjon.getMinRolleForPerson() &&
+                oppdatertRelasjon.getRelatertPersonsRolle() != relasjon.getRelatertPersonsRolle();
+    }
 }
diff --git a/apps/pdl-forvalter/src/main/resources/application-local.yaml b/apps/pdl-forvalter/src/main/resources/application-local.yaml
index e84c628b8f3..4641b33a829 100644
--- a/apps/pdl-forvalter/src/main/resources/application-local.yaml
+++ b/apps/pdl-forvalter/src/main/resources/application-local.yaml
@@ -1,4 +1,3 @@
-
 spring:
   application:
     name: testnav-pdl-forvalter
@@ -9,10 +8,8 @@ spring:
       fail-fast: true
       connection-timeout: 15000
       read-timeout: 30000
-      generic:
-        enabled: false
   datasource:
-    url: jdbc:postgresql://localhost:5432/pdl-forvalter-test
+    url: jdbc:postgresql://localhost:5432/postgres
     hikari:
       maximum-pool-size: 10
       minimum-idle: 1