diff --git a/.github/workflows/dotnet-migrations-ensure-compatibility.yaml b/.github/workflows/dotnet-migrations-ensure-compatibility.yaml
index ce5dc94fa09..1ceea0f0d55 100644
--- a/.github/workflows/dotnet-migrations-ensure-compatibility.yaml
+++ b/.github/workflows/dotnet-migrations-ensure-compatibility.yaml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install dotnet ef # Version should be the same as Migrations docker file and project
-        run: dotnet tool install --version 8.0.7 --global dotnet-ef
+        run: dotnet tool install --version 9.0.0 --global dotnet-ef
 
       - name: Check if migrations script can be generated
         run: |
diff --git a/backend/Migrations.Dockerfile b/backend/Migrations.Dockerfile
index 6523121e42b..09569daacc0 100644
--- a/backend/Migrations.Dockerfile
+++ b/backend/Migrations.Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /app
 
 COPY . .
 
-RUN dotnet tool install --version 8.0.7 --global dotnet-ef
+RUN dotnet tool install --version 9.0.0 --global dotnet-ef
 ENV PATH="$PATH:/root/.dotnet/tools"
 
 ENV OidcLoginSettings__FetchClientIdAndSecretFromRootEnvFile=false
diff --git a/backend/packagegroups/NuGet.props b/backend/packagegroups/NuGet.props
index 389193bbd30..7aa6307c86f 100644
--- a/backend/packagegroups/NuGet.props
+++ b/backend/packagegroups/NuGet.props
@@ -29,8 +29,8 @@
     <PackageReference Update="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
     <PackageReference Update="HtmlAgilityPack" Version="1.11.67" />
     <PackageReference Update="Microsoft.DiaSymReader.Native" Version="1.7.0" />
-    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.8" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10" />
+    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.1" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0" />
     <PackageReference Update="Microsoft.FeatureManagement.AspNetCore" Version="3.5.0" />
     <PackageReference Update="Scrutor" Version="4.2.2" />
     <PackageReference Update="Polly" Version="8.4.2" />
diff --git a/backend/src/DataModeling/Converter/Csharp/JsonMetadataToCsharpConverter.cs b/backend/src/DataModeling/Converter/Csharp/JsonMetadataToCsharpConverter.cs
index ac2a0672f8f..938e0ada84b 100644
--- a/backend/src/DataModeling/Converter/Csharp/JsonMetadataToCsharpConverter.cs
+++ b/backend/src/DataModeling/Converter/Csharp/JsonMetadataToCsharpConverter.cs
@@ -182,7 +182,7 @@ private void ParseFieldProperty(ElementMetadata element, StringBuilder classBuil
             else
             {
                 elementOrder += 1;
-                AddXmlElementAnnotation(element, classBuilder, elementOrder);
+                AddXmlElementAnnotation(element, classBuilder, elementOrder, !isValueType && (element.Nillable ?? false));
 
                 // Temporary fix - as long as we use System.Text.Json for serialization and  Newtonsoft.Json for
                 // deserialization, we need both JsonProperty and JsonPropertyName annotations.
@@ -265,16 +265,21 @@ private void ParseGroupProperty(ElementMetadata element, StringBuilder classBuil
             }
         }
 
-        private void AddXmlElementAnnotation(ElementMetadata element, StringBuilder classBuilder, int elementOrder)
+        private void AddXmlElementAnnotation(ElementMetadata element, StringBuilder classBuilder, int elementOrder, bool addNillableAttribute = false)
         {
-            if (element.OrderOblivious)
+            string additionalAttributeParams = string.Empty;
+            if (!element.OrderOblivious)
             {
-                classBuilder.AppendLine($"""{Indent(2)}[XmlElement("{element.XName}")]""");
+                additionalAttributeParams += $", Order = {elementOrder}";
             }
-            else
+
+            if (addNillableAttribute)
             {
-                classBuilder.AppendLine($"""{Indent(2)}[XmlElement("{element.XName}", Order = {elementOrder})]""");
+                additionalAttributeParams += ", IsNullable = true";
             }
+
+
+            classBuilder.AppendLine($"""{Indent(2)}[XmlElement("{element.XName}"{additionalAttributeParams})]""");
         }
 
         private void AddShouldSerializeForTagContent(ElementMetadata element, StringBuilder classBuilder, ModelMetadata modelMetadata)
diff --git a/backend/src/Designer/Controllers/ResourceAdminController.cs b/backend/src/Designer/Controllers/ResourceAdminController.cs
index 10be3387b87..8a68aac10a5 100644
--- a/backend/src/Designer/Controllers/ResourceAdminController.cs
+++ b/backend/src/Designer/Controllers/ResourceAdminController.cs
@@ -333,7 +333,7 @@ public async Task<ActionResult> ImportResource(string org, string serviceCode, i
         public async Task<ActionResult> GetDelegationCount(string org, string serviceCode, int serviceEdition, string env)
         {
             ServiceResource resource = await _resourceRegistry.GetServiceResourceFromService(serviceCode, serviceEdition, env.ToLower());
-            if (resource?.HasCompetentAuthority == null || !resource.HasCompetentAuthority.Orgcode.Equals(org, StringComparison.InvariantCultureIgnoreCase))
+            if (!IsServiceOwner(resource, org))
             {
                 return new UnauthorizedResult();
             }
@@ -348,7 +348,7 @@ public async Task<ActionResult> GetDelegationCount(string org, string serviceCod
         public async Task<ActionResult> MigrateDelegations([FromBody] ExportDelegationsRequestBE delegationRequest, string org, string env)
         {
             ServiceResource resource = await _resourceRegistry.GetServiceResourceFromService(delegationRequest.ServiceCode, delegationRequest.ServiceEditionCode, env.ToLower());
-            if (resource?.HasCompetentAuthority == null || !resource.HasCompetentAuthority.Orgcode.Equals(org, StringComparison.InvariantCultureIgnoreCase))
+            if (!IsServiceOwner(resource, org))
             {
                 return new UnauthorizedResult();
             }
@@ -602,6 +602,24 @@ private async Task<OrgList> GetOrgList()
             return orgList;
         }
 
+        private static bool IsServiceOwner(ServiceResource? resource, string loggedInOrg)
+        {
+            if (resource?.HasCompetentAuthority == null)
+            {
+                return false;
+            }
+
+            bool isOwnedByOrg = resource.HasCompetentAuthority.Orgcode.Equals(loggedInOrg, StringComparison.InvariantCultureIgnoreCase);
+
+            if (OrgUtil.IsTestEnv(loggedInOrg))
+            {
+                return isOwnedByOrg || resource.HasCompetentAuthority.Orgcode.Equals("acn", StringComparison.InvariantCultureIgnoreCase);
+            }
+
+            return isOwnedByOrg;
+
+        }
+
         private async Task<ResourceVersionInfo> AddEnvironmentResourceStatus(string env, string id)
         {
             ServiceResource resource = await _resourceRegistry.GetResource(id, env);
diff --git a/backend/src/Designer/Designer.csproj b/backend/src/Designer/Designer.csproj
index 341117518d1..c52469b77f6 100644
--- a/backend/src/Designer/Designer.csproj
+++ b/backend/src/Designer/Designer.csproj
@@ -14,10 +14,6 @@
     <Configurations>Release;Debug</Configurations>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <CodeAnalisysCompatibleVersion>4.5.0</CodeAnalisysCompatibleVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Altinn.App.Core" />
     <PackageReference Include="Altinn.Authorization.ABAC" />
@@ -59,8 +55,6 @@
     <PackageReference Include="NuGet.Versioning" />
     <PackageReference Include="Polly" />
     <PackageReference Include="Scrutor" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(CodeAnalisysCompatibleVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(CodeAnalisysCompatibleVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/backend/src/Designer/Exceptions/Options/InvalidOptionsFormatException.cs b/backend/src/Designer/Exceptions/Options/InvalidOptionsFormatException.cs
new file mode 100644
index 00000000000..0dc69bc495d
--- /dev/null
+++ b/backend/src/Designer/Exceptions/Options/InvalidOptionsFormatException.cs
@@ -0,0 +1,25 @@
+using System;
+
+namespace Altinn.Studio.Designer.Exceptions.Options;
+
+/// <summary>
+/// Indicates that an error occurred during json serialization of options.
+/// </summary>
+[Serializable]
+public class InvalidOptionsFormatException : Exception
+{
+    /// <inheritdoc/>
+    public InvalidOptionsFormatException()
+    {
+    }
+
+    /// <inheritdoc/>
+    public InvalidOptionsFormatException(string message) : base(message)
+    {
+    }
+
+    /// <inheritdoc/>
+    public InvalidOptionsFormatException(string message, Exception innerException) : base(message, innerException)
+    {
+    }
+}
diff --git a/backend/src/Designer/Filters/Options/OptionsErrorCodes.cs b/backend/src/Designer/Filters/Options/OptionsErrorCodes.cs
new file mode 100644
index 00000000000..9053087b1b5
--- /dev/null
+++ b/backend/src/Designer/Filters/Options/OptionsErrorCodes.cs
@@ -0,0 +1,6 @@
+namespace Altinn.Studio.Designer.Filters.Options;
+
+public class OptionsErrorCodes
+{
+    public const string InvalidOptionsFormat = nameof(InvalidOptionsFormat);
+}
diff --git a/backend/src/Designer/Filters/Options/OptionsExceptionFilterAttribute.cs b/backend/src/Designer/Filters/Options/OptionsExceptionFilterAttribute.cs
new file mode 100644
index 00000000000..ead5e0a589a
--- /dev/null
+++ b/backend/src/Designer/Filters/Options/OptionsExceptionFilterAttribute.cs
@@ -0,0 +1,26 @@
+using System.Net;
+using Altinn.Studio.Designer.Exceptions.Options;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Altinn.Studio.Designer.Filters.Options;
+
+public class OptionsExceptionFilterAttribute : ExceptionFilterAttribute
+{
+    public override void OnException(ExceptionContext context)
+    {
+        base.OnException(context);
+
+        if (context.ActionDescriptor is not ControllerActionDescriptor)
+        {
+            return;
+        }
+
+        if (context.Exception is InvalidOptionsFormatException)
+        {
+            context.Result = new ObjectResult(ProblemDetailsUtils.GenerateProblemDetails(context.Exception, OptionsErrorCodes.InvalidOptionsFormat, HttpStatusCode.BadRequest)) { StatusCode = (int)HttpStatusCode.BadRequest };
+        }
+    }
+
+}
diff --git a/backend/src/Designer/Filters/ProblemDetailsExtensionsCodes.cs b/backend/src/Designer/Filters/ProblemDetailsExtensionsCodes.cs
index 4064393c200..a70c0f6f152 100644
--- a/backend/src/Designer/Filters/ProblemDetailsExtensionsCodes.cs
+++ b/backend/src/Designer/Filters/ProblemDetailsExtensionsCodes.cs
@@ -3,5 +3,5 @@ namespace Altinn.Studio.Designer.Filters;
 public static class ProblemDetailsExtensionsCodes
 {
     public const string ErrorCode = "errorCode";
-
+    public const string Detail = "detail";
 }
diff --git a/backend/src/Designer/Helpers/JsonConverterHelpers/NotNullableAttribute.cs b/backend/src/Designer/Helpers/JsonConverterHelpers/NotNullableAttribute.cs
new file mode 100644
index 00000000000..c4a556f977c
--- /dev/null
+++ b/backend/src/Designer/Helpers/JsonConverterHelpers/NotNullableAttribute.cs
@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Altinn.Studio.Designer.Helpers.JsonConverterHelpers;
+
+public class NotNullableAttribute : ValidationAttribute
+{
+    protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+    {
+        if (value == null)
+        {
+            return new ValidationResult("The field is required.");
+        }
+        return ValidationResult.Success;
+    }
+}
diff --git a/backend/src/Designer/Helpers/JsonConverterHelpers/OptionConverterHelper.cs b/backend/src/Designer/Helpers/JsonConverterHelpers/OptionConverterHelper.cs
index a15ad94deeb..9ba74b172ef 100644
--- a/backend/src/Designer/Helpers/JsonConverterHelpers/OptionConverterHelper.cs
+++ b/backend/src/Designer/Helpers/JsonConverterHelpers/OptionConverterHelper.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Altinn.Studio.Designer.Exceptions.Options;
 
 namespace Altinn.Studio.Designer.Helpers.JsonConverterHelpers;
 
-public class OptionConverter : JsonConverter<object>
+public class OptionValueConverter : JsonConverter<object>
 {
     public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
@@ -14,7 +15,7 @@ public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
             JsonTokenType.Number when reader.TryGetDouble(out double d) => d,
             JsonTokenType.True => true,
             JsonTokenType.False => false,
-            _ => throw new JsonException($"Unsupported JSON token for Option.Value: {reader.TokenType}")
+            _ => throw new InvalidOptionsFormatException($"Unsupported JSON token for Value field, {typeToConvert}: {reader.TokenType}.")
         };
     }
 
@@ -32,7 +33,7 @@ public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOp
                 writer.WriteBooleanValue(b);
                 break;
             default:
-                throw new JsonException("Unsupported type for Option.Value.");
+                throw new InvalidOptionsFormatException($"{value} is an unsupported type for Value field. Accepted types are string, double and bool.");
         }
     }
 }
diff --git a/backend/src/Designer/Infrastructure/GitRepository/AltinnAppGitRepository.cs b/backend/src/Designer/Infrastructure/GitRepository/AltinnAppGitRepository.cs
index 7299c3c512b..93ddf76bcc4 100644
--- a/backend/src/Designer/Infrastructure/GitRepository/AltinnAppGitRepository.cs
+++ b/backend/src/Designer/Infrastructure/GitRepository/AltinnAppGitRepository.cs
@@ -425,20 +425,9 @@ public string[] GetLayoutSetNames()
         public void ChangeLayoutSetFolderName(string oldLayoutSetName, string newLayoutSetName, CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            if (DirectoryExistsByRelativePath(GetPathToLayoutSet(newLayoutSetName)))
-            {
-                throw new NonUniqueLayoutSetIdException("Suggested new layout set name already exist");
-            }
-            string destAbsolutePath = GetAbsoluteFileOrDirectoryPathSanitized(GetPathToLayoutSet(newLayoutSetName, true));
-
-            string sourceRelativePath = GetPathToLayoutSet(oldLayoutSetName, true);
-            if (!DirectoryExistsByRelativePath(sourceRelativePath))
-            {
-                throw new NotFoundException("Layout set you are trying to change doesn't exist");
-            }
-
-            string sourceAbsolutePath = GetAbsoluteFileOrDirectoryPathSanitized(sourceRelativePath);
-            Directory.Move(sourceAbsolutePath, destAbsolutePath);
+            string currentDirectoryPath = GetPathToLayoutSet(oldLayoutSetName, true);
+            string newDirectoryPath = GetPathToLayoutSet(newLayoutSetName, true);
+            MoveDirectoryByRelativePath(currentDirectoryPath, newDirectoryPath);
         }
 
         /// <summary>
@@ -575,15 +564,7 @@ public void UpdateFormLayoutName(string layoutSetName, string layoutFileName, st
         {
             string currentFilePath = GetPathToLayoutFile(layoutSetName, layoutFileName);
             string newFilePath = GetPathToLayoutFile(layoutSetName, newFileName);
-            if (!FileExistsByRelativePath(currentFilePath))
-            {
-                throw new FileNotFoundException("Layout does not exist.");
-            }
-            if (FileExistsByRelativePath(newFilePath))
-            {
-                throw new ArgumentException("New layout name must be unique.");
-            }
-            File.Move(GetAbsoluteFileOrDirectoryPathSanitized(currentFilePath), GetAbsoluteFileOrDirectoryPathSanitized(newFilePath));
+            MoveFileByRelativePath(currentFilePath, newFilePath, newFileName);
         }
 
         public async Task<LayoutSets> GetLayoutSetsFile(CancellationToken cancellationToken = default)
diff --git a/backend/src/Designer/Infrastructure/GitRepository/GitRepository.cs b/backend/src/Designer/Infrastructure/GitRepository/GitRepository.cs
index 6b78fe844ba..4b999c8cc03 100644
--- a/backend/src/Designer/Infrastructure/GitRepository/GitRepository.cs
+++ b/backend/src/Designer/Infrastructure/GitRepository/GitRepository.cs
@@ -254,19 +254,46 @@ public void DeleteFileByAbsolutePath(string absoluteFilePath)
         /// <param name="destinationFileName">FileName for the destination file</param>
         protected void MoveFileByRelativePath(string sourceRelativeFilePath, string destRelativeFilePath, string destinationFileName)
         {
-            if (FileExistsByRelativePath(sourceRelativeFilePath))
+            if (!FileExistsByRelativePath(sourceRelativeFilePath))
             {
-                Guard.AssertNotNullOrEmpty(sourceRelativeFilePath, nameof(sourceRelativeFilePath));
+                throw new FileNotFoundException($"File {sourceRelativeFilePath} does not exist.");
+            }
 
-                string sourceAbsoluteFilePath = GetAbsoluteFileOrDirectoryPathSanitized(sourceRelativeFilePath);
-                string destAbsoluteFilePath = GetAbsoluteFileOrDirectoryPathSanitized(destRelativeFilePath);
-                string destAbsoluteParentDirPath = destAbsoluteFilePath.Remove(destAbsoluteFilePath.IndexOf(destinationFileName, StringComparison.Ordinal));
-                Directory.CreateDirectory(destAbsoluteParentDirPath);
-                Guard.AssertFilePathWithinParentDirectory(RepositoryDirectory, sourceAbsoluteFilePath);
-                Guard.AssertFilePathWithinParentDirectory(RepositoryDirectory, destAbsoluteFilePath);
+            if (FileExistsByRelativePath(destRelativeFilePath))
+            {
+                throw new IOException($"Suggested file name {destinationFileName} already exists.");
+            }
+            string sourceAbsoluteFilePath = GetAbsoluteFileOrDirectoryPathSanitized(sourceRelativeFilePath);
+            string destAbsoluteFilePath = GetAbsoluteFileOrDirectoryPathSanitized(destRelativeFilePath);
+            string destAbsoluteParentDirPath = destAbsoluteFilePath.Remove(destAbsoluteFilePath.IndexOf(destinationFileName, StringComparison.Ordinal));
+            Directory.CreateDirectory(destAbsoluteParentDirPath);
+            Guard.AssertFilePathWithinParentDirectory(RepositoryDirectory, sourceAbsoluteFilePath);
+            Guard.AssertFilePathWithinParentDirectory(RepositoryDirectory, destAbsoluteFilePath);
+
+            File.Move(sourceAbsoluteFilePath, destAbsoluteFilePath);
+        }
 
-                File.Move(sourceAbsoluteFilePath, destAbsoluteFilePath);
+        /// <summary>
+        /// Move the specified folder to specified destination
+        /// </summary>
+        /// <param name="sourceRelativeDirectoryPath">Relative path to folder to be moved.</param>
+        /// <param name="destRelativeDirectoryPath">Relative path to destination of moved folder.</param>
+        protected void MoveDirectoryByRelativePath(string sourceRelativeDirectoryPath, string destRelativeDirectoryPath)
+        {
+            if (!DirectoryExistsByRelativePath(sourceRelativeDirectoryPath))
+            {
+                throw new DirectoryNotFoundException($"Directory {sourceRelativeDirectoryPath} does not exist.");
             }
+            if (DirectoryExistsByRelativePath(destRelativeDirectoryPath))
+            {
+                throw new IOException($"Suggested directory {destRelativeDirectoryPath} already exists.");
+            }
+            string sourceAbsoluteDirectoryPath = GetAbsoluteFileOrDirectoryPathSanitized(sourceRelativeDirectoryPath);
+            string destAbsoluteDirectoryPath = GetAbsoluteFileOrDirectoryPathSanitized(destRelativeDirectoryPath);
+            Guard.AssertFilePathWithinParentDirectory(RepositoryDirectory, sourceAbsoluteDirectoryPath);
+            Guard.AssertFilePathWithinParentDirectory(RepositoryDirectory, destAbsoluteDirectoryPath);
+
+            Directory.Move(sourceAbsoluteDirectoryPath, destAbsoluteDirectoryPath);
         }
 
         /// <summary>
diff --git a/backend/src/Designer/Infrastructure/MvcConfiguration.cs b/backend/src/Designer/Infrastructure/MvcConfiguration.cs
index b135b5a35cc..990b05a5498 100644
--- a/backend/src/Designer/Infrastructure/MvcConfiguration.cs
+++ b/backend/src/Designer/Infrastructure/MvcConfiguration.cs
@@ -2,6 +2,7 @@
 using Altinn.Studio.Designer.Filters.DataModeling;
 using Altinn.Studio.Designer.Filters.Git;
 using Altinn.Studio.Designer.Filters.IO;
+using Altinn.Studio.Designer.Filters.Options;
 using Altinn.Studio.Designer.ModelBinding;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
@@ -26,6 +27,7 @@ public static IServiceCollection ConfigureMvc(this IServiceCollection services)
                     options.Filters.Add(typeof(DataModelingExceptionFilterAttribute));
                     options.Filters.Add(typeof(GitExceptionFilterAttribute));
                     options.Filters.Add(typeof(IoExceptionFilterAttribute));
+                    options.Filters.Add(typeof(OptionsExceptionFilterAttribute));
                 })
                 .AddNewtonsoftJson(options => options.SerializerSettings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter()));
 
diff --git a/backend/src/Designer/Infrastructure/ServiceRegistration.cs b/backend/src/Designer/Infrastructure/ServiceRegistration.cs
index e91ca200073..8aba45e2e11 100644
--- a/backend/src/Designer/Infrastructure/ServiceRegistration.cs
+++ b/backend/src/Designer/Infrastructure/ServiceRegistration.cs
@@ -73,7 +73,6 @@ public static IServiceCollection RegisterServiceImplementations(this IServiceCol
             services.AddTransient<IAppDevelopmentService, AppDevelopmentService>();
             services.AddTransient<IPreviewService, PreviewService>();
             services.AddTransient<IDataService, DataService>();
-            services.AddTransient<IResourceRegistry, ResourceRegistryService>();
             services.AddTransient<IProcessModelingService, ProcessModelingService>();
             services.AddTransient<IImagesService, ImagesService>();
             services.RegisterDatamodeling(configuration);
diff --git a/backend/src/Designer/Models/Option.cs b/backend/src/Designer/Models/Option.cs
index ddfa6b9559e..b49a499ad28 100644
--- a/backend/src/Designer/Models/Option.cs
+++ b/backend/src/Designer/Models/Option.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using Altinn.Studio.Designer.Helpers.JsonConverterHelpers;
 
@@ -12,17 +11,17 @@ public class Option
     /// <summary>
     /// Value that connects the option to the data model.
     /// </summary>
-    [Required]
+    [NotNullable]
     [JsonPropertyName("value")]
-    [JsonConverter(typeof(OptionConverter))]
-    public object Value { get; set; }
+    [JsonConverter(typeof(OptionValueConverter))]
+    public required object Value { get; set; }
 
     /// <summary>
     /// Label to present to the user.
     /// </summary>
-    [Required]
+    [NotNullable]
     [JsonPropertyName("label")]
-    public string Label { get; set; }
+    public required string Label { get; set; }
 
     /// <summary>
     /// Description, typically displayed below the label.
diff --git a/backend/src/Designer/Program.cs b/backend/src/Designer/Program.cs
index e989dacb740..34b5ef65593 100644
--- a/backend/src/Designer/Program.cs
+++ b/backend/src/Designer/Program.cs
@@ -191,7 +191,7 @@ void ConfigureServices(IServiceCollection services, IConfiguration configuration
     services.Configure<MaskinportenClientSettings>(configuration.GetSection("MaskinportenClientSettings"));
     var maskinPortenClientName = "MaskinportenClient";
     services.RegisterMaskinportenClientDefinition<MaskinPortenClientDefinition>(maskinPortenClientName, configuration.GetSection("MaskinportenClientSettings"));
-    services.AddHttpClient<IResourceRegistry, ResourceRegistryService>().AddMaskinportenHttpMessageHandler<MaskinPortenClientDefinition>(maskinPortenClientName);
+    services.AddHttpClient<IResourceRegistry, ResourceRegistryService>();
 
     var maskinportenSettings = new MaskinportenClientSettings();
     configuration.GetSection("MaskinportenClientSettings").Bind(maskinportenSettings);
diff --git a/backend/src/Designer/Services/Implementation/OptionsService.cs b/backend/src/Designer/Services/Implementation/OptionsService.cs
index f1834c3156a..137b0cf5c34 100644
--- a/backend/src/Designer/Services/Implementation/OptionsService.cs
+++ b/backend/src/Designer/Services/Implementation/OptionsService.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Altinn.Studio.Designer.Exceptions.Options;
 using Altinn.Studio.Designer.Models;
 using Altinn.Studio.Designer.Services.Interfaces;
 using LibGit2Sharp;
@@ -50,9 +51,26 @@ public async Task<List<Option>> GetOptionsList(string org, string repo, string d
 
         string optionsListString = await altinnAppGitRepository.GetOptionsList(optionsListId, cancellationToken);
         var optionsList = JsonSerializer.Deserialize<List<Option>>(optionsListString);
+
+        try
+        {
+            optionsList.ForEach(ValidateOption);
+        }
+        catch (ValidationException)
+        {
+            throw new InvalidOptionsFormatException($"One or more of the options have an invalid format in option list: {optionsListId}.");
+        }
+
+
         return optionsList;
     }
 
+    private void ValidateOption(Option option)
+    {
+        var validationContext = new ValidationContext(option);
+        Validator.ValidateObject(option, validationContext, validateAllProperties: true);
+    }
+
     /// <inheritdoc />
     public async Task<List<Option>> CreateOrOverwriteOptionsList(string org, string repo, string developer, string optionsListId, List<Option> payload, CancellationToken cancellationToken = default)
     {
@@ -73,10 +91,10 @@ public async Task<List<Option>> UploadNewOption(string org, string repo, string
         List<Option> deserializedOptions = JsonSerializer.Deserialize<List<Option>>(payload.OpenReadStream(),
             new JsonSerializerOptions { WriteIndented = true, AllowTrailingCommas = true });
 
-        IEnumerable<Option> result = deserializedOptions.Where(option => IsNullOrEmptyOptionValue(option) || string.IsNullOrEmpty(option.Label));
-        if (result.Any())
+        bool optionListHasInvalidNullFields = deserializedOptions.Exists(option => option.Value == null || option.Label == null);
+        if (optionListHasInvalidNullFields)
         {
-            throw new JsonException("Uploaded file is missing one of the following attributes for an option: value or label.");
+            throw new InvalidOptionsFormatException("Uploaded file is missing one of the following attributes for an option: value or label.");
         }
 
         var altinnAppGitRepository = _altinnGitRepositoryFactory.GetAltinnAppGitRepository(org, repo, developer);
@@ -85,16 +103,6 @@ public async Task<List<Option>> UploadNewOption(string org, string repo, string
         return deserializedOptions;
     }
 
-    bool IsNullOrEmptyOptionValue(object value)
-    {
-        if (value == null)
-        {
-            return true;
-        }
-
-        return value is string stringOption && string.IsNullOrEmpty(stringOption);
-    }
-
     /// <inheritdoc />
     public void DeleteOptionsList(string org, string repo, string developer, string optionsListId)
     {
diff --git a/backend/src/Designer/Services/Implementation/ResourceRegistryService.cs b/backend/src/Designer/Services/Implementation/ResourceRegistryService.cs
index b0ec8376379..c33bca20689 100644
--- a/backend/src/Designer/Services/Implementation/ResourceRegistryService.cs
+++ b/backend/src/Designer/Services/Implementation/ResourceRegistryService.cs
@@ -70,7 +70,6 @@ public async Task<ActionResult> PublishServiceResource(ServiceResource serviceRe
             {
                 publishResourceToResourceRegistryUrl = $"{GetResourceRegistryBaseUrl(env)}{_platformSettings.ResourceRegistryUrl}";
                 getResourceRegistryUrl = $"{publishResourceToResourceRegistryUrl}/{serviceResource.Identifier}";
-                tokenResponse = await _maskinPortenService.ExchangeToAltinnToken(tokenResponse, env);
                 fullWritePolicyToResourceRegistryUrl = $"{GetResourceRegistryBaseUrl(env)}{_platformSettings.ResourceRegistryUrl}/{serviceResource.Identifier}/policy";
             }
             else
diff --git a/backend/tests/DataModeling.Tests/CsharpEnd2EndGenerationTests.cs b/backend/tests/DataModeling.Tests/CsharpEnd2EndGenerationTests.cs
index bafa3e4ccd1..ed8d1e6bdf1 100644
--- a/backend/tests/DataModeling.Tests/CsharpEnd2EndGenerationTests.cs
+++ b/backend/tests/DataModeling.Tests/CsharpEnd2EndGenerationTests.cs
@@ -76,7 +76,7 @@ public void JsonSchemaWithStringFieldInUriFormatShouldConvertToCSharp(string jso
                 .Then.CompiledAssembly.Should().NotBeNull();
         }
 
-        private void GeneratedClassesShouldBeEquivalentToExpected(string expectedCsharpClassPath)
+        private void GeneratedClassesShouldBeEquivalentToExpected(string expectedCsharpClassPath, bool overwriteExpected = false)
         {
             string expectedClasses = SharedResourcesHelper.LoadTestDataAsString(expectedCsharpClassPath);
 
@@ -86,7 +86,10 @@ private void GeneratedClassesShouldBeEquivalentToExpected(string expectedCsharpC
             _testOutput.WriteLine(CSharpClasses);
 
             // Save the current generated classes to the expected file so they can be compared with git diff.
-            SharedResourcesHelper.WriteUpdatedTestData(expectedCsharpClassPath, CSharpClasses);
+            if (overwriteExpected)
+            {
+                SharedResourcesHelper.WriteUpdatedTestData(expectedCsharpClassPath, CSharpClasses);
+            }
 
             var expectedAssembly = Compiler.CompileToAssembly(expectedClasses);
 
diff --git a/backend/tests/DataModeling.Tests/Utils/SerializationHelper.cs b/backend/tests/DataModeling.Tests/Utils/SerializationHelper.cs
index 2e60bfd5da6..bae8973bf5e 100644
--- a/backend/tests/DataModeling.Tests/Utils/SerializationHelper.cs
+++ b/backend/tests/DataModeling.Tests/Utils/SerializationHelper.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using SharedResources.Tests;
 
 namespace DataModeling.Tests.Utils
 {
@@ -20,7 +21,7 @@ public static object Deserialize(string xml, Type type)
         public static string SerializeXml(object o)
         {
             var xmlSerializer = new XmlSerializer(o.GetType());
-            using var textWriter = new StringWriter();
+            using var textWriter = new Utf8StringWriter();
             xmlSerializer.Serialize(textWriter, o);
             return textWriter.ToString();
         }
diff --git a/backend/tests/DataModeling.Tests/XmlDeserializeSerializeTests.cs b/backend/tests/DataModeling.Tests/XmlDeserializeSerializeTests.cs
new file mode 100644
index 00000000000..d5f011bc8bb
--- /dev/null
+++ b/backend/tests/DataModeling.Tests/XmlDeserializeSerializeTests.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Linq;
+using System.Xml.Linq;
+using System.Xml.Serialization;
+using DataModeling.Tests.BaseClasses;
+using DataModeling.Tests.Utils;
+using FluentAssertions;
+using SharedResources.Tests;
+using Xunit;
+
+namespace DataModeling.Tests;
+
+public class XmlDeserializeSerializeTests : CsharpModelConversionTestsBase<XmlDeserializeSerializeTests>
+{
+    [Theory]
+    [InlineData("Model/XmlSchema/XsAll/xsall-example.xsd", "Model/Xml/XsAll/xsall-example-nillable-sample.xml")]
+    public void XmlDeserializeSerializeShouldKeepNillValue(string xsdSchemaPath, string xmlPath)
+    {
+        Given.That.XsdSchemaLoaded(xsdSchemaPath)
+            .When.LoadedXsdSchemaConvertedToJsonSchema()
+            .And.ConvertedJsonSchemaConvertedToModelMetadata()
+            .And.ModelMetadataConvertedToCsharpClass()
+            .And.CSharpClassesCompiledToAssembly()
+            .Then.CompiledAssembly.Should().NotBeNull();
+
+        And.DeserializeAndSerializeShouldProduceSameXml(xmlPath);
+    }
+
+    private void DeserializeAndSerializeShouldProduceSameXml(string xmlPath)
+    {
+        Type csharpType = CompiledAssembly.Types().Single(type => type.CustomAttributes.Any(att => att.AttributeType == typeof(XmlRootAttribute)));
+
+        string loadedXml = SharedResourcesHelper.LoadTestDataAsString(xmlPath);
+
+        // Deserialize xml to new object of type csharpType
+        object deserializedObject = SerializationHelper.Deserialize(loadedXml, csharpType);
+
+        // serialize xml back to string
+        string serializedXml = SerializationHelper.SerializeXml(deserializedObject);
+
+        // Compare the original xml with the serialized xml
+        var expected = XDocument.Parse(loadedXml);
+        var result = XDocument.Parse(serializedXml);
+        Assert.True(XNode.DeepEquals(expected, result));
+    }
+}
diff --git a/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/GetOptionListIdsTests.cs b/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/GetOptionListIdsTests.cs
index b501fd527fb..c5b77263ef4 100644
--- a/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/GetOptionListIdsTests.cs
+++ b/backend/tests/Designer.Tests/Controllers/AppDevelopmentController/GetOptionListIdsTests.cs
@@ -29,6 +29,7 @@ public async Task GetOptionsListIds_ShouldReturnOk(string org, string app, strin
             {
                 { "other-options" },
                 { "test-options" },
+                { "options-with-null-fields" },
             };
 
             string url = $"{VersionPrefix(org, targetRepository)}/option-list-ids";
@@ -39,7 +40,7 @@ public async Task GetOptionsListIds_ShouldReturnOk(string org, string app, strin
 
             string responseContent = await response.Content.ReadAsStringAsync();
             List<string> responseList = JsonSerializer.Deserialize<List<string>>(responseContent);
-            responseList.Count.Should().Be(2);
+            responseList.Count.Should().Be(3);
             foreach (string id in expectedOptionsListIds)
             {
                 responseList.Should().Contain(id);
diff --git a/backend/tests/Designer.Tests/Controllers/OptionsController/GetOptionsTests.cs b/backend/tests/Designer.Tests/Controllers/OptionsController/GetOptionsTests.cs
index 6406ed2f63f..fc3c00fbc0a 100644
--- a/backend/tests/Designer.Tests/Controllers/OptionsController/GetOptionsTests.cs
+++ b/backend/tests/Designer.Tests/Controllers/OptionsController/GetOptionsTests.cs
@@ -1,11 +1,13 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Altinn.Studio.Designer.Filters;
 using Altinn.Studio.Designer.Models;
 using Designer.Tests.Controllers.ApiTests;
+using FluentAssertions;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Xunit;
 
@@ -96,4 +98,26 @@ public async Task GetSingleOptionsList_Returns404NotFound_WhenOptionsListDoesNot
         // Assert
         Assert.Equal(StatusCodes.Status404NotFound, (int)response.StatusCode);
     }
+
+    [Fact]
+    public async Task GetSingleOptionsList_Returns400BadRequest_WhenOptionsListIsInvalid()
+    {
+        // Arrange
+        const string repo = "app-with-options";
+        const string optionsListId = "options-with-null-fields";
+
+        string apiUrl = $"/designer/api/ttd/{repo}/options/{optionsListId}";
+        using HttpRequestMessage httpRequestMessage = new(HttpMethod.Get, apiUrl);
+
+        // Act
+        using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status400BadRequest, (int)response.StatusCode);
+
+        var problemDetails = JsonSerializer.Deserialize<ProblemDetails>(await response.Content.ReadAsStringAsync());
+        problemDetails.Should().NotBeNull();
+        JsonElement errorCode = (JsonElement)problemDetails.Extensions[ProblemDetailsExtensionsCodes.ErrorCode];
+        errorCode.ToString().Should().Be("InvalidOptionsFormat");
+    }
 }
diff --git a/backend/tests/Designer.Tests/Controllers/OptionsController/UpdateOptionsTests.cs b/backend/tests/Designer.Tests/Controllers/OptionsController/UpdateOptionsTests.cs
index 94e11ef07a4..28a3fbad16b 100644
--- a/backend/tests/Designer.Tests/Controllers/OptionsController/UpdateOptionsTests.cs
+++ b/backend/tests/Designer.Tests/Controllers/OptionsController/UpdateOptionsTests.cs
@@ -1,12 +1,15 @@
 using System.Collections.Generic;
 using System.Net.Http;
-using System.Net.Http.Json;
+using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Altinn.Studio.Designer.Filters;
 using Altinn.Studio.Designer.Models;
 using Designer.Tests.Controllers.ApiTests;
 using Designer.Tests.Utils;
+using FluentAssertions;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Xunit;
 
@@ -31,23 +34,15 @@ public async Task Put_Returns_200OK_When_Creating_New_OptionsList()
         string targetRepository = TestDataHelper.GenerateTestRepoName();
         await CopyRepositoryForTest(Org, repo, Developer, targetRepository);
 
-        var newOptionsList = new List<Option>
-        {
-            new ()
-            {
-                Label = "label1",
-                Value = "value1",
-            },
-            new ()
-            {
-                Label = "label2",
-                Value = "value2",
-            }
-        };
+        string optionsJson = @"[
+            { ""label"": ""label1"", ""value"": ""value1"" },
+            { ""label"": ""label2"", ""value"": ""value2"" }
+        ]";
+        List<Option> expectedOptionList = JsonSerializer.Deserialize<List<Option>>(optionsJson);
 
         string apiUrl = $"/designer/api/{Org}/{targetRepository}/options/{optionsListId}";
         using HttpRequestMessage httpRequestMessage = new(HttpMethod.Put, apiUrl);
-        httpRequestMessage.Content = JsonContent.Create(newOptionsList);
+        httpRequestMessage.Content = new StringContent(optionsJson, Encoding.UTF8, "application/json");
 
         // Act
         using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
@@ -56,14 +51,14 @@ public async Task Put_Returns_200OK_When_Creating_New_OptionsList()
 
         // Assert
         Assert.Equal(StatusCodes.Status200OK, (int)response.StatusCode);
-        Assert.Equal(newOptionsList.Count, responseList.Count);
+        Assert.Equal(expectedOptionList.Count, responseList.Count);
 
-        for (int i = 0; i < newOptionsList.Count; i++)
+        for (int i = 0; i < responseList.Count; i++)
         {
-            Assert.Equal(newOptionsList[i].Label, responseList[i].Label);
-            Assert.Equal(newOptionsList[i].Value, responseList[i].Value);
-            Assert.Equal(newOptionsList[i].Description, responseList[i].Description);
-            Assert.Equal(newOptionsList[i].HelpText, responseList[i].HelpText);
+            Assert.Equal(expectedOptionList[i].Label, responseList[i].Label);
+            Assert.Equal(expectedOptionList[i].Value, responseList[i].Value);
+            Assert.Equal(expectedOptionList[i].Description, responseList[i].Description);
+            Assert.Equal(expectedOptionList[i].HelpText, responseList[i].HelpText);
         }
     }
 
@@ -79,25 +74,36 @@ public async Task Put_Returns_200OK_When_Option_Values_Are_Bool_String_Double()
         string apiUrl = $"/designer/api/{Org}/{targetRepository}/options/{optionsListId}";
         using HttpRequestMessage httpRequestMessage = new(HttpMethod.Put, apiUrl);
 
-        var stringBoolDoubleOptionsList = new List<Option>
-        {
-            new ()
-            {
-                Label = "StringValue",
-                Value = "value1",
-            },
-            new ()
-            {
-                Label = "BoolValue",
-                Value = true,
-            },
-            new ()
-            {
-                Label = "DoubleValue",
-                Value = 3.1415,
-            }
-        };
-        httpRequestMessage.Content = JsonContent.Create(stringBoolDoubleOptionsList);
+        var stringBoolDoubleOptionsList = @"[
+            { ""label"": ""StringValue"", ""value"": ""value"" },
+            { ""label"": ""BoolValue"", ""value"": true },
+            { ""label"": ""NumberValue"", ""value"": 3.1415 },
+        ]";
+        httpRequestMessage.Content = new StringContent(stringBoolDoubleOptionsList, Encoding.UTF8, "application/json");
+
+        // Act
+        using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status200OK, (int)response.StatusCode);
+    }
+
+    [Fact]
+    public async Task Put_Returns_200OK_When_Option_Value_And_Label_Are_Empty_Strings()
+    {
+        string repo = "app-with-options";
+        string optionsListId = "test-options";
+        // Arrange
+        string targetRepository = TestDataHelper.GenerateTestRepoName();
+        await CopyRepositoryForTest(Org, repo, Developer, targetRepository);
+
+        string apiUrl = $"/designer/api/{Org}/{targetRepository}/options/{optionsListId}";
+        using HttpRequestMessage httpRequestMessage = new(HttpMethod.Put, apiUrl);
+
+        var emptyStringsValueAndLabelOptionsList = @"[
+            { ""label"": """", ""value"": """" },
+        ]";
+        httpRequestMessage.Content = new StringContent(emptyStringsValueAndLabelOptionsList, Encoding.UTF8, "application/json");
 
         // Act
         using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
@@ -116,23 +122,15 @@ public async Task Put_Returns_200OK_And_Overwrites_Existing_OptionsList()
         string targetRepository = TestDataHelper.GenerateTestRepoName();
         await CopyRepositoryForTest(Org, repo, Developer, targetRepository);
 
-        var newOptionsList = new List<Option>
-        {
-            new ()
-            {
-                Label = "aNewLabelThatDidNotExistBefore",
-                Value = "aNewValueThatDidNotExistBefore",
-            },
-            new ()
-            {
-                Label = "label2",
-                Value = "value2",
-            }
-        };
+        var newOptionsList = @"[
+            { ""label"": ""aNewLabelThatDidNotExistBefore"", ""value"": ""aNewValueThatDidNotExistBefore"" },
+            { ""label"": ""label2"", ""value"": ""value2"" }
+        ]";
+        List<Option> expectedOptionList = JsonSerializer.Deserialize<List<Option>>(newOptionsList);
 
         string apiUrl = $"/designer/api/{Org}/{targetRepository}/options/{optionsListId}";
         using HttpRequestMessage httpRequestMessage = new(HttpMethod.Put, apiUrl);
-        httpRequestMessage.Content = JsonContent.Create(newOptionsList);
+        httpRequestMessage.Content = new StringContent(newOptionsList, Encoding.UTF8, "application/json");
 
         // Act
         using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
@@ -141,84 +139,106 @@ public async Task Put_Returns_200OK_And_Overwrites_Existing_OptionsList()
 
         // Assert
         Assert.Equal(StatusCodes.Status200OK, (int)response.StatusCode);
-        Assert.Equal(newOptionsList.Count, responseList.Count);
+        Assert.Equal(expectedOptionList.Count, responseList.Count);
 
-        for (int i = 0; i < newOptionsList.Count; i++)
+        for (int i = 0; i < expectedOptionList.Count; i++)
         {
-            Assert.Equal(newOptionsList[i].Label, responseList[i].Label);
-            Assert.Equal(newOptionsList[i].Value, responseList[i].Value);
-            Assert.Equal(newOptionsList[i].Description, responseList[i].Description);
-            Assert.Equal(newOptionsList[i].HelpText, responseList[i].HelpText);
+            Assert.Equal(expectedOptionList[i].Label, responseList[i].Label);
+            Assert.Equal(expectedOptionList[i].Value, responseList[i].Value);
+            Assert.Equal(expectedOptionList[i].Description, responseList[i].Description);
+            Assert.Equal(expectedOptionList[i].HelpText, responseList[i].HelpText);
         }
     }
 
-    [Theory]
-    [InlineData("options-missing-label")]
-    [InlineData("options-empty-json")]
-    public async Task Put_Returns_400BadRequest_When_OptionsList_Format_Is_Invalid(string optionsListId)
+    [Fact]
+    public async Task Put_Returns_400BadRequest_When_Options_Is_Empty()
     {
         // Arrange
         string targetRepository = TestDataHelper.GenerateTestRepoName();
         await CopyRepositoryForTest(Org, "empty-app", Developer, targetRepository);
 
-        string apiUrl = $"/designer/api/{Org}/{targetRepository}/options/{optionsListId}";
+        string apiUrl = $"/designer/api/{Org}/{targetRepository}/options/empty-options";
         using HttpRequestMessage httpRequestMessage = new(HttpMethod.Put, apiUrl);
 
-        if (optionsListId == "options-missing-label")
-        {
-            var invalidOptionsList = new List<Option>
-            {
-                new ()
-                {
-                    // Missing Label
-                    Value = "value1",
-                },
-                new ()
-                {
-                    Label = "label2",
-                    Value = "value2",
-                }
-            };
-            httpRequestMessage.Content = JsonContent.Create(invalidOptionsList);
-        }
-        else if (optionsListId == "options-empty-json")
-        {
-            httpRequestMessage.Content = JsonContent.Create<List<Option>>(null);
-        }
+
+        httpRequestMessage.Content = new StringContent("null", Encoding.UTF8, "application/json");
 
         // Act
         using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+        var responseContent = await response.Content.ReadAsStringAsync();
+        var responseObject = JsonSerializer.Deserialize<JsonElement>(responseContent);
 
         // Assert
         Assert.Equal(StatusCodes.Status400BadRequest, (int)response.StatusCode);
+        Assert.True(responseObject.TryGetProperty("errors", out JsonElement errors));
+        Assert.True(errors.TryGetProperty("", out JsonElement labelErrors));
+        Assert.Contains("A non-empty request body is required.", labelErrors[0].GetString());
     }
 
     [Fact]
     public async Task Put_Returns_400BadRequest_When_Option_Value_Is_Invalid()
     {
-        string repo = "app-with-options";
-        string optionsListId = "test-options";
         // Arrange
         string targetRepository = TestDataHelper.GenerateTestRepoName();
-        await CopyRepositoryForTest(Org, repo, Developer, targetRepository);
+        await CopyRepositoryForTest(Org, "empty-app", Developer, targetRepository);
 
-        string apiUrl = $"/designer/api/{Org}/{targetRepository}/options/{optionsListId}";
+        string apiUrl = $"/designer/api/{Org}/{targetRepository}/options/option-invalid-value";
         using HttpRequestMessage httpRequestMessage = new(HttpMethod.Put, apiUrl);
 
-        var invalidOptionsList = new List<Option>
-        {
-            new ()
-            {
-                Label = "ObjectValue",
-                Value = { },
-            },
-        };
-        httpRequestMessage.Content = JsonContent.Create(invalidOptionsList);
+        string optionsInvalidValue = @"[
+            { ""value"": {}, ""label"": ""label2"" },
+        ]";
+
+        httpRequestMessage.Content = new StringContent(optionsInvalidValue, Encoding.UTF8, "application/json");
+
+        // Act
+        using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+
+        var problemDetails = JsonSerializer.Deserialize<ProblemDetails>(await response.Content.ReadAsStringAsync());
+
+        // Assert
+        Assert.Equal(StatusCodes.Status400BadRequest, (int)response.StatusCode);
+
+        problemDetails.Should().NotBeNull();
+        JsonElement errorCode = (JsonElement)problemDetails.Extensions[ProblemDetailsExtensionsCodes.ErrorCode];
+        errorCode.ToString().Should().Be("InvalidOptionsFormat");
+    }
+
+    [Fact]
+    public async Task Put_Returns_400BadRequest_When_Options_Has_Missing_Required_Fields()
+    {
+        // Arrange
+        string targetRepository = TestDataHelper.GenerateTestRepoName();
+        await CopyRepositoryForTest(Org, "empty-app", Developer, targetRepository);
+
+        string apiUrl = $"/designer/api/{Org}/{targetRepository}/options/options-missing-fields";
+        using HttpRequestMessage httpRequestMessage = new(HttpMethod.Put, apiUrl);
+
+        string optionsWithMissingFields = @"[
+            { ""value"": ""value1"" },
+            { ""label"": ""label2"" },
+            { ""value"": null, ""label"": null },
+        ]";
+        httpRequestMessage.Content = new StringContent(optionsWithMissingFields, Encoding.UTF8, "application/json");
 
         // Act
         using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+        var responseContent = await response.Content.ReadAsStringAsync();
+        var responseObject = JsonSerializer.Deserialize<JsonElement>(responseContent);
 
         // Assert
         Assert.Equal(StatusCodes.Status400BadRequest, (int)response.StatusCode);
+        Assert.True(responseObject.TryGetProperty("errors", out JsonElement errors));
+
+        Assert.True(errors.TryGetProperty("[0].Label", out JsonElement labelErrors));
+        Assert.Contains("The field is required.", labelErrors[0].GetString());
+
+        Assert.True(errors.TryGetProperty("[1].Value", out JsonElement valueErrors));
+        Assert.Contains("The field is required.", valueErrors[0].GetString());
+
+        Assert.True(errors.TryGetProperty("[2].Value", out JsonElement valueNullErrors));
+        Assert.Contains("The field is required.", valueNullErrors[0].GetString());
+        Assert.True(errors.TryGetProperty("[2].Label", out JsonElement labelNullErrors));
+        Assert.Contains("The field is required.", labelNullErrors[0].GetString());
     }
 }
diff --git a/backend/tests/Designer.Tests/Controllers/OptionsController/UploadOptionsTests.cs b/backend/tests/Designer.Tests/Controllers/OptionsController/UploadOptionsTests.cs
new file mode 100644
index 00000000000..709ed0befde
--- /dev/null
+++ b/backend/tests/Designer.Tests/Controllers/OptionsController/UploadOptionsTests.cs
@@ -0,0 +1,196 @@
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Altinn.Studio.Designer.Filters;
+using Altinn.Studio.Designer.Models;
+using Designer.Tests.Controllers.ApiTests;
+using Designer.Tests.Utils;
+using FluentAssertions;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Xunit;
+
+namespace Designer.Tests.Controllers.OptionsController;
+
+public class UploadOptionsTests : DesignerEndpointsTestsBase<UploadOptionsTests>, IClassFixture<WebApplicationFactory<Program>>
+{
+    public UploadOptionsTests(WebApplicationFactory<Program> factory) : base(factory)
+    {
+    }
+
+    private const string VersionPrefix = "designer/api";
+    private const string Org = "ttd";
+    private const string Developer = "testUser";
+
+    [Fact]
+    public async Task Post_Returns_200OK_When_Uploading_New_OptionsList()
+    {
+        // Arrange
+        const string repo = "empty-app";
+
+        string targetRepository = TestDataHelper.GenerateTestRepoName();
+        await CopyRepositoryForTest(Org, repo, Developer, targetRepository);
+
+        string optionsFileName = "options.json";
+        string jsonOptions = @"[
+        {""label"": ""Label1"", ""value"": ""Value1"", ""description"": ""Description1"", ""helpText"": ""helpText"" },
+        {""label"": ""Label2"", ""value"": ""Value2"" }
+    ]";
+
+        byte[] optionsBytes = Encoding.UTF8.GetBytes(jsonOptions);
+        string apiUrl = $"{VersionPrefix}/{Org}/{targetRepository}/options/upload";
+        var content = new MultipartFormDataContent();
+        var optionsContent = new ByteArrayContent(optionsBytes);
+        optionsContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+        content.Add(optionsContent, "file", optionsFileName);
+        using HttpRequestMessage httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, apiUrl)
+        {
+            Content = content
+        };
+
+        // Act
+        using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+        string responseBody = await response.Content.ReadAsStringAsync();
+        var responseList = JsonSerializer.Deserialize<List<Option>>(responseBody);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status200OK, (int)response.StatusCode);
+        Assert.Equal(2, responseList.Count);
+    }
+
+    [Fact]
+    public async Task Post_Returns_200OK_When_Uploading_New_OptionsList_With_Empty_Strings()
+    {
+        // Arrange
+        const string repo = "empty-app";
+
+        string targetRepository = TestDataHelper.GenerateTestRepoName();
+        await CopyRepositoryForTest(Org, repo, Developer, targetRepository);
+
+        string optionsFileName = "simple-options.json";
+        string jsonOptions = @"[
+        {""label"": """", ""value"": """" },
+    ]";
+
+        byte[] optionsBytes = Encoding.UTF8.GetBytes(jsonOptions);
+        string apiUrl = $"{VersionPrefix}/{Org}/{targetRepository}/options/upload";
+        var content = new MultipartFormDataContent();
+        var optionsContent = new ByteArrayContent(optionsBytes);
+        optionsContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+        content.Add(optionsContent, "file", optionsFileName);
+        using HttpRequestMessage httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, apiUrl)
+        {
+            Content = content
+        };
+
+        // Act
+        using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status200OK, (int)response.StatusCode);
+    }
+
+    [Fact]
+    public async Task Post_Returns_400BadRequest_When_Uploading_New_OptionsList_With_Missing_Fields()
+    {
+        // Arrange
+        const string repo = "empty-app";
+
+        string targetRepository = TestDataHelper.GenerateTestRepoName();
+        await CopyRepositoryForTest(Org, repo, Developer, targetRepository);
+
+        string optionsFileName = "missing-fields-options.json";
+        string jsonOptions = @"[
+        {""value"": """" }, 
+        {""label"": """" },
+    ]";
+
+        byte[] optionsBytes = Encoding.UTF8.GetBytes(jsonOptions);
+        string apiUrl = $"{VersionPrefix}/{Org}/{targetRepository}/options/upload";
+        var content = new MultipartFormDataContent();
+        var optionsContent = new ByteArrayContent(optionsBytes);
+        optionsContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+        content.Add(optionsContent, "file", optionsFileName);
+        using HttpRequestMessage httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, apiUrl)
+        {
+            Content = content
+        };
+
+        // Act
+        using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status400BadRequest, (int)response.StatusCode);
+    }
+
+    [Fact]
+    public async Task Post_Returns_400BadRequest_When_Uploading_New_OptionsList_With_Null_Values()
+    {
+        // Arrange
+        const string repo = "empty-app";
+
+        string targetRepository = TestDataHelper.GenerateTestRepoName();
+        await CopyRepositoryForTest(Org, repo, Developer, targetRepository);
+
+        string optionsFileName = "null-options.json";
+        string jsonOptions = @"[
+        {""label"": null, ""value"": null }
+    ]";
+
+        byte[] optionsBytes = Encoding.UTF8.GetBytes(jsonOptions);
+        string apiUrl = $"{VersionPrefix}/{Org}/{targetRepository}/options/upload";
+        var content = new MultipartFormDataContent();
+        var optionsContent = new ByteArrayContent(optionsBytes);
+        optionsContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+        content.Add(optionsContent, "file", optionsFileName);
+        using HttpRequestMessage httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, apiUrl)
+        {
+            Content = content
+        };
+
+        // Act
+        using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status400BadRequest, (int)response.StatusCode);
+    }
+
+    [Fact]
+    public async Task Post_Returns_400BadRequest_When_Uploading_New_OptionsList_With_Invalid_Format()
+    {
+        // Arrange
+        const string repo = "empty-app";
+
+        string targetRepository = TestDataHelper.GenerateTestRepoName();
+        await CopyRepositoryForTest(Org, repo, Developer, targetRepository);
+
+        string optionsFileName = "invalid-value-options.json";
+        string jsonOptions = @"[{""value"": {}, ""label"": """"}]";
+
+        byte[] optionsBytes = Encoding.UTF8.GetBytes(jsonOptions);
+        string apiUrl = $"{VersionPrefix}/{Org}/{targetRepository}/options/upload";
+        var content = new MultipartFormDataContent();
+        var optionsContent = new ByteArrayContent(optionsBytes);
+        optionsContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+        content.Add(optionsContent, "file", optionsFileName);
+        using HttpRequestMessage httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, apiUrl)
+        {
+            Content = content
+        };
+
+        // Act
+        using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status400BadRequest, (int)response.StatusCode);
+
+        var problemDetails = JsonSerializer.Deserialize<ProblemDetails>(await response.Content.ReadAsStringAsync());
+        problemDetails.Should().NotBeNull();
+        JsonElement errorCode = (JsonElement)problemDetails.Extensions[ProblemDetailsExtensionsCodes.ErrorCode];
+        errorCode.ToString().Should().Be("InvalidOptionsFormat");
+    }
+}
diff --git a/backend/tests/Designer.Tests/Designer.Tests.csproj b/backend/tests/Designer.Tests/Designer.Tests.csproj
index daf49e71bcd..3598a50a8dd 100644
--- a/backend/tests/Designer.Tests/Designer.Tests.csproj
+++ b/backend/tests/Designer.Tests/Designer.Tests.csproj
@@ -10,10 +10,6 @@
     <TestRepoPrefix>test-repo-</TestRepoPrefix>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <CodeAnalisysCompatibleVersion>4.5.0</CodeAnalisysCompatibleVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Altinn.ApiClients.Maskinporten" />
     <PackageReference Include="Basic.Reference.Assemblies" />
@@ -37,9 +33,6 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyModel" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(CodeAnalisysCompatibleVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(CodeAnalisysCompatibleVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalisysCompatibleVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/backend/tests/Designer.Tests/Infrastructure/GitRepository/AltinnAppGitRepositoryTests.cs b/backend/tests/Designer.Tests/Infrastructure/GitRepository/AltinnAppGitRepositoryTests.cs
index a8fdab0af65..ad920f48a16 100644
--- a/backend/tests/Designer.Tests/Infrastructure/GitRepository/AltinnAppGitRepositoryTests.cs
+++ b/backend/tests/Designer.Tests/Infrastructure/GitRepository/AltinnAppGitRepositoryTests.cs
@@ -291,7 +291,7 @@ public Task GetOptionListIds_WithAppThatHasOptionLists_ShouldReturnOptionListPat
             string[] optionListIds = altinnAppGitRepository.GetOptionsListIds();
 
             optionListIds.Should().NotBeNull();
-            optionListIds.Should().HaveCount(2);
+            optionListIds.Should().HaveCount(3);
             return Task.CompletedTask;
         }
 
diff --git a/backend/tests/Designer.Tests/Services/OptionsServiceTests.cs b/backend/tests/Designer.Tests/Services/OptionsServiceTests.cs
index 2a7322f1488..3d787539035 100644
--- a/backend/tests/Designer.Tests/Services/OptionsServiceTests.cs
+++ b/backend/tests/Designer.Tests/Services/OptionsServiceTests.cs
@@ -18,7 +18,7 @@ public class OptionsServiceTests
     public async Task GetOptionsListIds_ShouldReturnOptionsListIds_WhenOptionsListsExist()
     {
         // Arrange
-        const string repo = "app-with-options"; // Has 2 options lists
+        const string repo = "app-with-options";
         string targetRepository = TestDataHelper.GenerateTestRepoName();
         await TestDataHelper.CopyRepositoryForTest(Org, repo, Developer, targetRepository);
 
@@ -27,14 +27,14 @@ public async Task GetOptionsListIds_ShouldReturnOptionsListIds_WhenOptionsListsE
         string[] optionListIds = optionsService.GetOptionsListIds(Org, targetRepository, Developer);
 
         // Assert
-        Assert.Equal(2, optionListIds.Length);
+        Assert.Equal(3, optionListIds.Length);
     }
 
     [Fact]
     public async Task GetOptionsListIds_ShouldReturnEmptyArray_WhenOptionsListsDoesNotExist()
     {
         // Arrange
-        const string repo = "empty-app"; // Has no options lists
+        const string repo = "empty-app";
         string targetRepository = TestDataHelper.GenerateTestRepoName();
         await TestDataHelper.CopyRepositoryForTest(Org, repo, Developer, targetRepository);
 
@@ -50,7 +50,6 @@ public async Task GetOptionsListIds_ShouldReturnEmptyArray_WhenOptionsListsDoesN
     public async Task GetOptionsList_ShouldReturnOptionsList_WhenOptionsExists()
     {
         // Arrange
-        // This  options list matches the options in 'app-with-options'
         var expectedOptions = new List<Option>
         {
             new Option
@@ -90,7 +89,7 @@ public async Task GetOptionsList_ShouldReturnOptionsList_WhenOptionsExists()
     public async Task GetOptionsList_ShouldThrowNotFoundException_WhenOptionsListDoesNotExist()
     {
         // Arrange
-        const string repo = "empty-app"; // Has no options lists
+        const string repo = "empty-app";
         const string optionListId = "test-options";
 
         var optionsService = GetOptionsServiceForTest();
@@ -120,7 +119,7 @@ public async Task CreateOrOverwriteOptionsList_ShouldReturnUpdatedOptionsList_Wh
             }
         };
 
-        const string repo = "empty-app"; // Has no options lists
+        const string repo = "empty-app";
         const string optionListId = "test-options";
         string targetRepository = TestDataHelper.GenerateTestRepoName();
         await TestDataHelper.CopyRepositoryForTest(Org, repo, Developer, targetRepository);
@@ -160,13 +159,13 @@ public async Task CreateOrOverwriteOptionsList_ShouldReturnUpdatedOptionsList_Wh
         };
 
         const string repo = "app-with-options";
-        const string optionListId = "test-options"; // Name of an existing options list
+        const string existingOptionListId = "test-options";
         string targetRepository = TestDataHelper.GenerateTestRepoName();
         await TestDataHelper.CopyRepositoryForTest(Org, repo, Developer, targetRepository);
 
         // Act
         var optionsService = GetOptionsServiceForTest();
-        var updatedOptions = await optionsService.CreateOrOverwriteOptionsList(Org, targetRepository, Developer, optionListId, newOptions);
+        var updatedOptions = await optionsService.CreateOrOverwriteOptionsList(Org, targetRepository, Developer, existingOptionListId, newOptions);
 
         // Assert
         Assert.Equal(updatedOptions.Count, updatedOptions.Count);
diff --git a/backend/tests/Designer.Tests/_TestData/Repositories/testUser/ttd/app-with-options/App/options/options-with-null-fields.json b/backend/tests/Designer.Tests/_TestData/Repositories/testUser/ttd/app-with-options/App/options/options-with-null-fields.json
new file mode 100644
index 00000000000..49b3aec5409
--- /dev/null
+++ b/backend/tests/Designer.Tests/_TestData/Repositories/testUser/ttd/app-with-options/App/options/options-with-null-fields.json
@@ -0,0 +1,6 @@
+[
+{
+  "label": null,
+  "value": null
+}
+]
\ No newline at end of file
diff --git a/eidlogger/Dockerfile b/eidlogger/Dockerfile
index de480a6fce9..1a987873ed2 100644
--- a/eidlogger/Dockerfile
+++ b/eidlogger/Dockerfile
@@ -12,7 +12,7 @@ COPY src ./src
 RUN ./mvnw clean package -DskipTests
 
 # Package stage
-FROM eclipse-temurin:21.0.4_7-jre-alpine
+FROM eclipse-temurin:21.0.5_11-jre-alpine
 COPY --from=build /app/target/*.jar app.jar
 EXPOSE 8080
 ENTRYPOINT ["java", "-jar", "app.jar"]
diff --git a/eidlogger/pom.xml b/eidlogger/pom.xml
index 964e08252b5..3d007f7f282 100644
--- a/eidlogger/pom.xml
+++ b/eidlogger/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>no.altinn</groupId>
@@ -17,7 +17,7 @@
 		<java.version>21</java.version>
     <springdoc.version>2.6.0</springdoc.version>
     <log-event.version>1.2.2</log-event.version>
-    <spring-cloud-azure.version>5.16.0</spring-cloud-azure.version>
+    <spring-cloud-azure.version>5.18.0</spring-cloud-azure.version>
 	</properties>
   <dependencyManagement>
     <dependencies>
diff --git a/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/SchemaEditorWithToolbar.tsx b/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/SchemaEditorWithToolbar.tsx
index 7c6cba15a82..3a68e7c8ce1 100644
--- a/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/SchemaEditorWithToolbar.tsx
+++ b/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/SchemaEditorWithToolbar.tsx
@@ -7,7 +7,7 @@ import { SelectedSchemaEditor } from './SelectedSchemaEditor';
 import type { DataModelMetadata } from 'app-shared/types/DataModelMetadata';
 import { SchemaGenerationErrorsPanel } from './SchemaGenerationErrorsPanel';
 import { useAddXsdMutation } from '../../../hooks/mutations/useAddXsdMutation';
-import { isXsdFile } from 'app-shared/utils/filenameUtils';
+import { FileNameUtils } from '@studio/pure-functions';
 
 export interface SchemaEditorWithToolbarProps {
   createPathOption?: boolean;
@@ -32,7 +32,7 @@ export const SchemaEditorWithToolbar = ({
 
   useEffect(() => {
     dataModels.forEach((model) => {
-      if (model.repositoryRelativeUrl && isXsdFile(model.repositoryRelativeUrl)) {
+      if (model.repositoryRelativeUrl && FileNameUtils.isXsdFile(model.repositoryRelativeUrl)) {
         addXsdFromRepo(model.repositoryRelativeUrl);
       }
     });
diff --git a/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/SelectedSchemaEditor.tsx b/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/SelectedSchemaEditor.tsx
index ae817cd8fde..9b1d7fb985b 100644
--- a/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/SelectedSchemaEditor.tsx
+++ b/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/SelectedSchemaEditor.tsx
@@ -16,7 +16,7 @@ import { useQueryClient } from '@tanstack/react-query';
 import { QueryKey } from 'app-shared/types/QueryKey';
 import { useStudioEnvironmentParams } from 'app-shared/hooks/useStudioEnvironmentParams';
 import { mergeJsonAndXsdData } from 'app-development/utils/metadataUtils';
-import { extractFilename, removeSchemaExtension } from 'app-shared/utils/filenameUtils';
+import { FileNameUtils } from '@studio/pure-functions';
 export interface SelectedSchemaEditorProps {
   modelPath: string;
 }
@@ -111,6 +111,6 @@ const SchemaEditorWithDebounce = ({ jsonSchema, modelPath }: SchemaEditorWithDeb
 };
 
 const extractModelNameFromPath = (path: string): string => {
-  const filename = extractFilename(path);
-  return removeSchemaExtension(filename);
+  const filename = FileNameUtils.extractFilename(path);
+  return FileNameUtils.removeSchemaExtension(filename);
 };
diff --git a/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/XSDUpload/XSDUpload.tsx b/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/XSDUpload/XSDUpload.tsx
index 5919dfbd758..0ccdf8a4d62 100644
--- a/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/XSDUpload/XSDUpload.tsx
+++ b/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/XSDUpload/XSDUpload.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import type { StudioButtonProps } from '@studio/components';
 import { StudioFileUploader, StudioSpinner } from '@studio/components';
+import { FileNameUtils } from '@studio/pure-functions';
 import { useTranslation } from 'react-i18next';
 import { useUploadDataModelMutation } from '../../../../../hooks/mutations/useUploadDataModelMutation';
 import type { AxiosError } from 'axios';
@@ -10,7 +11,6 @@ import type { MetadataOption } from '../../../../../types/MetadataOption';
 import { useStudioEnvironmentParams } from 'app-shared/hooks/useStudioEnvironmentParams';
 import { useAppMetadataQuery } from 'app-shared/hooks/queries';
 import { useValidationAlert } from './useValidationAlert';
-import { removeExtension } from 'app-shared/utils/filenameUtils';
 import {
   doesFileExistInMetadataWithClassRef,
   doesFileExistInMetadataWithoutClassRef,
@@ -65,7 +65,7 @@ export const XSDUpload = ({
     if (fileNameError) {
       validationAlert(fileNameError);
     }
-    const fileNameWithoutExtension = removeExtension(file.name);
+    const fileNameWithoutExtension = FileNameUtils.removeExtension(file.name);
     if (doesFileExistInMetadataWithClassRef(appMetadata, fileNameWithoutExtension)) {
       const userConfirmed = window.confirm(
         t('schema_editor.error_upload_data_model_id_exists_override_option'),
diff --git a/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/XSDUpload/validationUtils.ts b/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/XSDUpload/validationUtils.ts
index 768ef1ee4d6..7367c51abd6 100644
--- a/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/XSDUpload/validationUtils.ts
+++ b/frontend/app-development/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/XSDUpload/validationUtils.ts
@@ -1,5 +1,5 @@
 import type { ApplicationMetadata } from 'app-shared/types/ApplicationMetadata';
-import { removeExtension } from 'app-shared/utils/filenameUtils';
+import { FileNameUtils } from '@studio/pure-functions';
 import type { FileNameError } from './FileNameError';
 
 export const doesFileExistInMetadataWithClassRef = (
@@ -28,7 +28,7 @@ export const findFileNameError = (
   fileName: string,
   appMetadata: ApplicationMetadata,
 ): FileNameError | null => {
-  const fileNameWithoutExtension = removeExtension(fileName);
+  const fileNameWithoutExtension = FileNameUtils.removeExtension(fileName);
   if (!isNameFormatValid(fileNameWithoutExtension)) {
     return 'invalidFileName';
   } else if (doesFileExistInMetadata(appMetadata, fileNameWithoutExtension)) {
diff --git a/frontend/app-development/hooks/mutations/useDeleteDataModelMutation.test.ts b/frontend/app-development/hooks/mutations/useDeleteDataModelMutation.test.ts
index 9154efb9771..a07cd5301a5 100644
--- a/frontend/app-development/hooks/mutations/useDeleteDataModelMutation.test.ts
+++ b/frontend/app-development/hooks/mutations/useDeleteDataModelMutation.test.ts
@@ -6,7 +6,7 @@ import { createQueryClientMock } from 'app-shared/mocks/queryClientMock';
 import { waitFor } from '@testing-library/react';
 import { QueryKey } from 'app-shared/types/QueryKey';
 import { queriesMock } from 'app-shared/mocks/queriesMock';
-import { createJsonModelPathMock } from 'app-shared/mocks/modelPathMocks';
+import { createJsonModelPathMock, createXsdModelPathMock } from 'app-shared/mocks/modelPathMocks';
 import {
   createJsonMetadataMock,
   createXsdMetadataMock,
@@ -14,7 +14,8 @@ import {
 import { app, org } from '@studio/testing/testids';
 
 const modelName = 'modelName';
-const modelPath = createJsonModelPathMock(modelName);
+const modelJsonPath = createJsonModelPathMock(modelName);
+const modelXsdPath = createXsdModelPathMock(modelName);
 const modelMetadataJson = createJsonMetadataMock(modelName);
 const modelMetadataXsd = createXsdMetadataMock(modelName);
 
@@ -29,38 +30,62 @@ describe('useDeleteDataModelMutation', () => {
       renderHookResult: { result },
     } = render({}, client);
     expect(result.current).toBeDefined();
-    result.current.mutate(modelPath);
+    result.current.mutate(modelJsonPath);
     await waitFor(() => result.current.isSuccess);
     expect(queriesMock.deleteDataModel).toHaveBeenCalledTimes(1);
-    expect(queriesMock.deleteDataModel).toHaveBeenCalledWith(org, app, modelPath);
+    expect(queriesMock.deleteDataModel).toHaveBeenCalledWith(org, app, modelJsonPath);
   });
 
-  it('Removes the metadata instances from the query cache', async () => {
+  it('Removes the metadata instances from the query cache when model is json', async () => {
     const client = createQueryClientMock();
     client.setQueryData([QueryKey.DataModelsJson, org, app], [modelMetadataJson]);
     client.setQueryData([QueryKey.DataModelsXsd, org, app], [modelMetadataXsd]);
     const {
       renderHookResult: { result },
     } = render({}, client);
-    result.current.mutate(modelPath);
+    result.current.mutate(modelJsonPath);
     await waitFor(() => result.current.isSuccess);
     expect(client.getQueryData([QueryKey.DataModelsJson, org, app])).toEqual([]);
     expect(client.getQueryData([QueryKey.DataModelsXsd, org, app])).toEqual([]);
   });
 
-  it('Removes the schema queries from the query cache', async () => {
+  it('Removes the metadata instances from the query cache when model is xsd', async () => {
     const client = createQueryClientMock();
     client.setQueryData([QueryKey.DataModelsJson, org, app], [modelMetadataJson]);
     client.setQueryData([QueryKey.DataModelsXsd, org, app], [modelMetadataXsd]);
     const {
       renderHookResult: { result },
     } = render({}, client);
-    result.current.mutate(modelPath);
+    result.current.mutate(modelXsdPath);
     await waitFor(() => result.current.isSuccess);
-    expect(client.getQueryData([QueryKey.JsonSchema, org, app, modelPath])).toBeUndefined();
-    expect(
-      client.getQueryData([QueryKey.JsonSchema, org, app, modelMetadataXsd.repositoryRelativeUrl]),
-    ).toBeUndefined();
+    expect(client.getQueryData([QueryKey.DataModelsJson, org, app])).toEqual([]);
+    expect(client.getQueryData([QueryKey.DataModelsXsd, org, app])).toEqual([]);
+  });
+
+  it('Removes the schema queries from the query cache when model is json', async () => {
+    const client = createQueryClientMock();
+    client.setQueryData([QueryKey.DataModelsJson, org, app], [modelMetadataJson]);
+    client.setQueryData([QueryKey.DataModelsXsd, org, app], [modelMetadataXsd]);
+    const {
+      renderHookResult: { result },
+    } = render({}, client);
+    result.current.mutate(modelJsonPath);
+    await waitFor(() => result.current.isSuccess);
+    expect(client.getQueryData([QueryKey.JsonSchema, org, app, modelJsonPath])).toBeUndefined();
+    expect(client.getQueryData([QueryKey.JsonSchema, org, app, modelXsdPath])).toBeUndefined();
+  });
+
+  it('Removes the schema queries from the query cache when model is xsd', async () => {
+    const client = createQueryClientMock();
+    client.setQueryData([QueryKey.DataModelsJson, org, app], [modelMetadataJson]);
+    client.setQueryData([QueryKey.DataModelsXsd, org, app], [modelMetadataXsd]);
+    const {
+      renderHookResult: { result },
+    } = render({}, client);
+    result.current.mutate(modelXsdPath);
+    await waitFor(() => result.current.isSuccess);
+    expect(client.getQueryData([QueryKey.JsonSchema, org, app, modelJsonPath])).toBeUndefined();
+    expect(client.getQueryData([QueryKey.JsonSchema, org, app, modelXsdPath])).toBeUndefined();
   });
 
   it('Invalidates the appMetadataModelIds and appMetadata from the cache', async () => {
@@ -71,7 +96,7 @@ describe('useDeleteDataModelMutation', () => {
     const {
       renderHookResult: { result },
     } = render({}, client);
-    result.current.mutate(modelPath);
+    result.current.mutate(modelJsonPath);
     await waitFor(() => result.current.isSuccess);
     expect(invalidateQueriesSpy).toHaveBeenCalledTimes(2);
     expect(invalidateQueriesSpy).toHaveBeenCalledWith({
diff --git a/frontend/app-development/hooks/mutations/useDeleteDataModelMutation.ts b/frontend/app-development/hooks/mutations/useDeleteDataModelMutation.ts
index 06f78743c46..aa549aab7b0 100644
--- a/frontend/app-development/hooks/mutations/useDeleteDataModelMutation.ts
+++ b/frontend/app-development/hooks/mutations/useDeleteDataModelMutation.ts
@@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useServicesContext } from 'app-shared/contexts/ServicesContext';
 import { QueryKey } from 'app-shared/types/QueryKey';
 import { useStudioEnvironmentParams } from 'app-shared/hooks/useStudioEnvironmentParams';
-import { isXsdFile } from 'app-shared/utils/filenameUtils';
+import { FileNameUtils } from '@studio/pure-functions';
 import type { DataModelMetadata } from 'app-shared/types/DataModelMetadata';
 
 export const useDeleteDataModelMutation = () => {
@@ -11,10 +11,12 @@ export const useDeleteDataModelMutation = () => {
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async (modelPath: string) => {
-      const jsonSchemaPath = isXsdFile(modelPath)
+      const jsonSchemaPath = FileNameUtils.isXsdFile(modelPath)
         ? modelPath.replace('.xsd', '.schema.json')
         : modelPath;
-      const xsdPath = isXsdFile(modelPath) ? modelPath : modelPath.replace('.schema.json', '.xsd');
+      const xsdPath = FileNameUtils.isXsdFile(modelPath)
+        ? modelPath
+        : modelPath.replace('.schema.json', '.xsd');
       queryClient.setQueryData(
         [QueryKey.DataModelsJson, org, app],
         (oldData: DataModelMetadata[]) => removeDataModelFromList(oldData, jsonSchemaPath),
diff --git a/frontend/app-development/hooks/queries/useGetScopesQuery.ts b/frontend/app-development/hooks/queries/useGetScopesQuery.ts
new file mode 100644
index 00000000000..292b67316fa
--- /dev/null
+++ b/frontend/app-development/hooks/queries/useGetScopesQuery.ts
@@ -0,0 +1,12 @@
+import { useQuery } from '@tanstack/react-query';
+import { QueryKey } from 'app-shared/types/QueryKey';
+import { useServicesContext } from 'app-shared/contexts/ServicesContext';
+import { type MaskinportenScope } from 'app-shared/types/MaskinportenScope';
+
+export const useGetScopesQuery = () => {
+  const { getMaskinportenScopes } = useServicesContext();
+  return useQuery<MaskinportenScope[]>({
+    queryKey: [QueryKey.AppScopes],
+    queryFn: () => getMaskinportenScopes(),
+  });
+};
diff --git a/frontend/app-development/hooks/queries/useIsLoggedInWithAnsattportenQuery.ts b/frontend/app-development/hooks/queries/useIsLoggedInWithAnsattportenQuery.ts
new file mode 100644
index 00000000000..b40dfd28ad7
--- /dev/null
+++ b/frontend/app-development/hooks/queries/useIsLoggedInWithAnsattportenQuery.ts
@@ -0,0 +1,11 @@
+import { useQuery } from '@tanstack/react-query';
+import { QueryKey } from 'app-shared/types/QueryKey';
+import { useServicesContext } from 'app-shared/contexts/ServicesContext';
+
+export const useIsLoggedInWithAnsattportenQuery = () => {
+  const { getIsLoggedInWithAnsattporten } = useServicesContext();
+  return useQuery<boolean>({
+    queryKey: [QueryKey.IsLoggedInWithAnsattporten],
+    queryFn: () => getIsLoggedInWithAnsattporten(),
+  });
+};
diff --git a/frontend/app-development/hooks/useOpenSettingsModalBasedQueryParam.test.ts b/frontend/app-development/hooks/useOpenSettingsModalBasedQueryParam.test.ts
new file mode 100644
index 00000000000..60809622836
--- /dev/null
+++ b/frontend/app-development/hooks/useOpenSettingsModalBasedQueryParam.test.ts
@@ -0,0 +1,59 @@
+import { renderHookWithProviders } from '../test/mocks';
+import {
+  queryParamKey,
+  useOpenSettingsModalBasedQueryParam,
+} from './useOpenSettingsModalBasedQueryParam';
+import { useSearchParams } from 'react-router-dom';
+import { useSettingsModalContext } from '../contexts/SettingsModalContext';
+import { waitFor } from '@testing-library/react';
+
+jest.mock('../contexts/SettingsModalContext');
+jest.mock('react-router-dom', () => ({
+  useSearchParams: jest.fn(),
+}));
+
+describe('useOpenSettingsModalBasedQueryParam', () => {
+  it('should open "settingsModal" if query params has valid tab id', async () => {
+    const searchParams = buildSearchParams('about');
+    setupSearchParamMock(searchParams);
+
+    const openSettingsMock = jest.fn();
+    setupUseSettingsModalContextMock(openSettingsMock);
+
+    renderHookWithProviders()(() => useOpenSettingsModalBasedQueryParam());
+    await waitFor(() => expect(openSettingsMock).toHaveBeenCalledWith('about'));
+    expect(openSettingsMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('should not open "settingsModal" if query params has an invalid tab id', async () => {
+    const searchParams = buildSearchParams('doestNotExistTab');
+    setupSearchParamMock(searchParams);
+
+    const openSettingsMock = jest.fn();
+    setupUseSettingsModalContextMock(openSettingsMock);
+
+    renderHookWithProviders()(() => useOpenSettingsModalBasedQueryParam());
+    await waitFor(() => expect(openSettingsMock).not.toHaveBeenCalledWith('doestNotExistTab'));
+    expect(openSettingsMock).toHaveBeenCalledTimes(0);
+  });
+});
+
+function setupSearchParamMock(searchParams: URLSearchParams): jest.Mock {
+  return (useSearchParams as jest.Mock).mockReturnValue([searchParams, jest.fn()]);
+}
+
+function buildSearchParams(queryParamValue: string): URLSearchParams {
+  const searchParams: URLSearchParams = new URLSearchParams();
+  searchParams.set(queryParamKey, queryParamValue);
+  return searchParams;
+}
+
+function setupUseSettingsModalContextMock(openSettingsMock: typeof jest.fn): jest.Mock {
+  return (useSettingsModalContext as jest.Mock).mockReturnValue({
+    settingsRef: {
+      current: {
+        openSettings: openSettingsMock,
+      },
+    },
+  });
+}
diff --git a/frontend/app-development/hooks/useOpenSettingsModalBasedQueryParam.ts b/frontend/app-development/hooks/useOpenSettingsModalBasedQueryParam.ts
new file mode 100644
index 00000000000..05b562a7276
--- /dev/null
+++ b/frontend/app-development/hooks/useOpenSettingsModalBasedQueryParam.ts
@@ -0,0 +1,27 @@
+import { useEffect } from 'react';
+import { useSearchParams } from 'react-router-dom';
+import { useSettingsModalContext } from '../contexts/SettingsModalContext';
+import type { SettingsModalTabId } from '../types/SettingsModalTabId';
+import { useSettingsModalMenuTabConfigs } from '../layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/hooks/useSettingsModalMenuTabConfigs';
+
+export const queryParamKey: string = 'openSettingsModalWithTab';
+
+export function useOpenSettingsModalBasedQueryParam(): void {
+  const [searchParams] = useSearchParams();
+  const { settingsRef } = useSettingsModalContext();
+  const settingsModalTabs = useSettingsModalMenuTabConfigs();
+
+  const tabIds = settingsModalTabs.map(({ tabId }) => tabId);
+
+  useEffect((): void => {
+    const tabToOpen: SettingsModalTabId = searchParams.get(queryParamKey) as SettingsModalTabId;
+    const shouldOpenModal: boolean = isValidTab(tabToOpen, tabIds);
+    if (shouldOpenModal) {
+      settingsRef.current.openSettings(tabToOpen);
+    }
+  }, [searchParams, settingsRef, tabIds]);
+}
+
+function isValidTab(tabId: SettingsModalTabId, tabIds: Array<SettingsModalTabId>): boolean {
+  return tabIds.includes(tabId);
+}
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/SettingsModal.test.tsx b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/SettingsModal.test.tsx
index 237a8e6d81d..431bdb49396 100644
--- a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/SettingsModal.test.tsx
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/SettingsModal.test.tsx
@@ -14,6 +14,7 @@ import { MemoryRouter } from 'react-router-dom';
 import { SettingsModalContextProvider } from 'app-development/contexts/SettingsModalContext';
 import { PreviewContextProvider } from 'app-development/contexts/PreviewContext';
 import type { SettingsModalHandle } from 'app-development/types/SettingsModalHandle';
+import { typedLocalStorage } from '@studio/pure-functions';
 
 jest.mock('app-development/hooks/mutations/useAppConfigMutation');
 
@@ -38,6 +39,26 @@ describe('SettingsModal', () => {
     await user.click(closeButton);
   });
 
+  it('should hide the "Maskinporten" tab when the feature flag is not enabled', async () => {
+    await resolveAndWaitForSpinnerToDisappear();
+    const maskinPortenTab = screen.queryByRole('tab', {
+      name: textMock('settings_modal.left_nav_tab_maskinporten'),
+    });
+
+    expect(maskinPortenTab).not.toBeInTheDocument();
+  });
+
+  it('should display the "Maskinporten" tab when the feature flag is enabled.', async () => {
+    typedLocalStorage.setItem<string[]>('featureFlags', ['maskinporten']);
+    await resolveAndWaitForSpinnerToDisappear();
+    const maskinPortenTab = screen.getByRole('tab', {
+      name: textMock('settings_modal.left_nav_tab_maskinporten'),
+    });
+
+    expect(maskinPortenTab).toBeInTheDocument();
+    typedLocalStorage.removeItem('featureFlags');
+  });
+
   it('displays left navigation bar when promises resolve', async () => {
     await resolveAndWaitForSpinnerToDisappear();
     expect(getAboutTab()).toBeInTheDocument();
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/SettingsModal.tsx b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/SettingsModal.tsx
index 491acf72e32..c5dad2b42fe 100644
--- a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/SettingsModal.tsx
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/SettingsModal.tsx
@@ -2,7 +2,11 @@ import type { ReactElement } from 'react';
 import React, { forwardRef, useCallback, useImperativeHandle, useRef, useState } from 'react';
 import classes from './SettingsModal.module.css';
 import { CogIcon } from '@studio/icons';
-import { StudioModal, StudioContentMenu } from '@studio/components';
+import {
+  StudioModal,
+  StudioContentMenu,
+  type StudioContentMenuButtonTabProps,
+} from '@studio/components';
 import type { SettingsModalTabId } from '../../../../../types/SettingsModalTabId';
 import { useTranslation } from 'react-i18next';
 import { PolicyTab } from './components/Tabs/PolicyTab';
@@ -11,6 +15,8 @@ import { AccessControlTab } from './components/Tabs/AccessControlTab';
 import { SetupTab } from './components/Tabs/SetupTab';
 import { type SettingsModalHandle } from '../../../../../types/SettingsModalHandle';
 import { useSettingsModalMenuTabConfigs } from './hooks/useSettingsModalMenuTabConfigs';
+import { Maskinporten } from './components/Tabs/Maskinporten';
+import { shouldDisplayFeature } from 'app-shared/utils/featureToggleUtils';
 
 export const SettingsModal = forwardRef<SettingsModalHandle, {}>(({}, ref): ReactElement => {
   const { t } = useTranslation();
@@ -19,6 +25,8 @@ export const SettingsModal = forwardRef<SettingsModalHandle, {}>(({}, ref): Reac
   const dialogRef = useRef<HTMLDialogElement>();
   const menuTabConfigs = useSettingsModalMenuTabConfigs();
 
+  const menuTabsToRender = filterFeatureFlag(menuTabConfigs);
+
   const openSettings = useCallback(
     (tab: SettingsModalTabId = currentTab) => {
       setCurrentTab(tab);
@@ -45,6 +53,9 @@ export const SettingsModal = forwardRef<SettingsModalHandle, {}>(({}, ref): Reac
       case 'access_control': {
         return <AccessControlTab />;
       }
+      case 'maskinporten': {
+        return shouldDisplayFeature('maskinporten') ? <Maskinporten /> : null;
+      }
     }
   };
 
@@ -63,7 +74,7 @@ export const SettingsModal = forwardRef<SettingsModalHandle, {}>(({}, ref): Reac
           selectedTabId={currentTab}
           onChangeTab={(tabId: SettingsModalTabId) => setCurrentTab(tabId)}
         >
-          {menuTabConfigs.map((contentTab) => (
+          {menuTabsToRender.map((contentTab) => (
             <StudioContentMenu.ButtonTab
               key={contentTab.tabId}
               tabName={contentTab.tabName}
@@ -79,3 +90,11 @@ export const SettingsModal = forwardRef<SettingsModalHandle, {}>(({}, ref): Reac
 });
 
 SettingsModal.displayName = 'SettingsModal';
+
+function filterFeatureFlag(
+  menuTabConfigs: Array<StudioContentMenuButtonTabProps<SettingsModalTabId>>,
+) {
+  return shouldDisplayFeature('maskinporten')
+    ? menuTabConfigs
+    : menuTabConfigs.filter((tab) => tab.tabId !== 'maskinporten');
+}
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/AccessControlTab/SelectAllowedPartyTypes/SelectAllowedPartyTypes.module.css b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/AccessControlTab/SelectAllowedPartyTypes/SelectAllowedPartyTypes.module.css
index a21b976bd23..6d35050a332 100644
--- a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/AccessControlTab/SelectAllowedPartyTypes/SelectAllowedPartyTypes.module.css
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/AccessControlTab/SelectAllowedPartyTypes/SelectAllowedPartyTypes.module.css
@@ -6,7 +6,3 @@
 .header {
   background-color: var(--fds-colors-grey-100);
 }
-
-.checkboxContent {
-  width: 3rem;
-}
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/AccessControlTab/SelectAllowedPartyTypes/SelectAllowedPartyTypes.tsx b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/AccessControlTab/SelectAllowedPartyTypes/SelectAllowedPartyTypes.tsx
index a169a474cd5..4800cb26b1f 100644
--- a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/AccessControlTab/SelectAllowedPartyTypes/SelectAllowedPartyTypes.tsx
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/AccessControlTab/SelectAllowedPartyTypes/SelectAllowedPartyTypes.tsx
@@ -1,5 +1,4 @@
-import React, { useRef } from 'react';
-import { Table, Checkbox } from '@digdir/designsystemet-react';
+import React, { type ReactElement, useRef } from 'react';
 import type { ApplicationMetadata, PartyTypesAllowed } from 'app-shared/types/ApplicationMetadata';
 import classes from './SelectAllowedPartyTypes.module.css';
 import { useTranslation } from 'react-i18next';
@@ -7,12 +6,15 @@ import { getPartyTypesAllowedOptions } from '../../../../utils/tabUtils/accessCo
 import { useAppMetadataMutation } from 'app-development/hooks/mutations';
 import { AccessControlWarningModal } from '../AccessControWarningModal';
 import { useStudioEnvironmentParams } from 'app-shared/hooks/useStudioEnvironmentParams';
+import { StudioCheckboxTable } from '@studio/components';
 
-export interface SelectAllowedPartyTypesProps {
+export type SelectAllowedPartyTypesProps = {
   appMetadata: ApplicationMetadata;
-}
+};
 
-export const SelectAllowedPartyTypes = ({ appMetadata }: SelectAllowedPartyTypesProps) => {
+export const SelectAllowedPartyTypes = ({
+  appMetadata,
+}: SelectAllowedPartyTypesProps): ReactElement => {
   const { t } = useTranslation();
   const { org, app } = useStudioEnvironmentParams();
 
@@ -59,45 +61,27 @@ export const SelectAllowedPartyTypes = ({ appMetadata }: SelectAllowedPartyTypes
 
   return (
     <>
-      <Table className={classes.tableContent}>
-        <Table.Head>
-          <Table.Row>
-            <Table.HeaderCell className={classes.header}>
-              <Checkbox
-                aria-label={t('settings_modal.access_control_tab_option_all_types')}
-                checked={areAllCheckboxesChecked || isNoCheckboxesChecked}
-                indeterminate={!areAllCheckboxesChecked && isSomeCheckboxesChecked}
-                onChange={handleTableHeaderCheckboxChange}
-                aria-checked
-                size='small'
-                value='all'
-              />
-            </Table.HeaderCell>
-            <Table.HeaderCell className={classes.header} aria-hidden>
-              {t('settings_modal.access_control_tab_option_all_types')}
-            </Table.HeaderCell>
-          </Table.Row>
-        </Table.Head>
-        <Table.Body>
-          {getPartyTypesAllowedOptions().map((mappedOption, key) => (
-            <Table.Row key={mappedOption.value}>
-              <Table.Cell className={classes.checkboxContent}>
-                <Checkbox
-                  aria-label={t(mappedOption.label)}
-                  key={key}
-                  onChange={() =>
-                    handleAllowedPartyTypeChange(partyTypesAllowed, mappedOption.value)
-                  }
-                  size='small'
-                  value={mappedOption.value}
-                  checked={partyTypesAllowed[mappedOption.value] || isNoCheckboxesChecked}
-                />
-              </Table.Cell>
-              <Table.Cell>{t(mappedOption.label)}</Table.Cell>
-            </Table.Row>
+      <StudioCheckboxTable className={classes.tableContent}>
+        <StudioCheckboxTable.Header
+          title={t('settings_modal.access_control_tab_option_all_types')}
+          checked={areAllCheckboxesChecked || isNoCheckboxesChecked}
+          indeterminate={!areAllCheckboxesChecked && isSomeCheckboxesChecked}
+          onChange={handleTableHeaderCheckboxChange}
+        />
+        <StudioCheckboxTable.Body>
+          {getPartyTypesAllowedOptions().map((mappedOption) => (
+            <StudioCheckboxTable.Row
+              key={mappedOption.value}
+              rowElement={{
+                ...mappedOption,
+                label: t(mappedOption.label),
+                checked: partyTypesAllowed[mappedOption.value] || isNoCheckboxesChecked,
+              }}
+              onChange={() => handleAllowedPartyTypeChange(partyTypesAllowed, mappedOption.value)}
+            />
           ))}
-        </Table.Body>
-      </Table>
+        </StudioCheckboxTable.Body>
+      </StudioCheckboxTable>
       <AccessControlWarningModal modalRef={modalRef} />
     </>
   );
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/Maskinporten.test.tsx b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/Maskinporten.test.tsx
new file mode 100644
index 00000000000..bc975820bfa
--- /dev/null
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/Maskinporten.test.tsx
@@ -0,0 +1,120 @@
+import React from 'react';
+import { screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
+import { Maskinporten } from './Maskinporten';
+import { renderWithProviders } from '../../../../../../../../test/mocks';
+import { textMock } from '@studio/testing/mocks/i18nMock';
+import { queriesMock } from 'app-shared/mocks/queriesMock';
+import { createQueryClientMock } from 'app-shared/mocks/queryClientMock';
+import userEvent from '@testing-library/user-event';
+
+describe('Maskinporten', () => {
+  const consoleLogMock = jest.fn();
+  const originalConsoleLog = console.log;
+  beforeEach(() => {
+    console.log = consoleLogMock;
+  });
+
+  afterEach(() => {
+    console.log = originalConsoleLog;
+  });
+
+  it('should check and verify if the user is logged in', async () => {
+    const getIsLoggedInWithAnsattportenMock = jest
+      .fn()
+      .mockImplementation(() => Promise.resolve(false));
+
+    renderMaskinporten({
+      queries: {
+        getIsLoggedInWithAnsattporten: getIsLoggedInWithAnsattportenMock,
+      },
+    });
+    await waitForLoggedInStatusCheckIsDone();
+    await waitFor(() => expect(getIsLoggedInWithAnsattportenMock).toHaveBeenCalledTimes(1));
+  });
+
+  it('should display information about login and login button, if user is not logged in', async () => {
+    renderMaskinporten();
+    await waitForLoggedInStatusCheckIsDone();
+
+    const title = screen.getByRole('heading', {
+      level: 2,
+      name: textMock('settings_modal.maskinporten_tab_title'),
+    });
+    expect(title).toBeInTheDocument();
+
+    const description = screen.getByText(textMock('settings_modal.maskinporten_tab_description'));
+    expect(description).toBeInTheDocument();
+
+    const loginButton = screen.getByRole('button', {
+      name: textMock('settings_modal.maskinporten_tab_login_with_ansattporten'),
+    });
+    expect(loginButton).toBeInTheDocument();
+  });
+
+  it('should display content if logged in', async () => {
+    const getIsLoggedInWithAnsattportenMock = jest
+      .fn()
+      .mockImplementation(() => Promise.resolve(true));
+    renderMaskinporten({
+      queries: {
+        getIsLoggedInWithAnsattporten: getIsLoggedInWithAnsattportenMock,
+      },
+    });
+
+    await waitForLoggedInStatusCheckIsDone();
+
+    const loginButton = screen.queryByRole('button', {
+      name: textMock('settings_modal.maskinporten_tab_login_with_ansattporten'),
+    });
+    expect(loginButton).not.toBeInTheDocument();
+  });
+
+  it('should invoke "handleLoginWithAnsattPorten" when login button is clicked', async () => {
+    const user = userEvent.setup();
+    renderMaskinporten();
+    await waitForLoggedInStatusCheckIsDone();
+
+    const loginButton = screen.getByRole('button', {
+      name: textMock('settings_modal.maskinporten_tab_login_with_ansattporten'),
+    });
+
+    await user.click(loginButton);
+
+    expect(consoleLogMock).toHaveBeenCalledWith(
+      'Will be implemented in next iteration when backend is ready',
+    );
+  });
+
+  it('should show an alert with text that no scopes are available for user', async () => {
+    const getIsLoggedInWithAnsattportenMock = jest
+      .fn()
+      .mockImplementation(() => Promise.resolve(true));
+
+    const mockGetMaskinportenScopes = jest.fn().mockImplementation(() => Promise.resolve([]));
+
+    renderMaskinporten({
+      queries: {
+        getIsLoggedInWithAnsattporten: getIsLoggedInWithAnsattportenMock,
+        getMaskinportenScopes: mockGetMaskinportenScopes,
+      },
+    });
+
+    await waitForLoggedInStatusCheckIsDone();
+
+    expect(
+      screen.getByText(textMock('settings_modal.maskinporten_no_scopes_available')),
+    ).toBeInTheDocument();
+  });
+});
+
+type RenderMaskinporten = {
+  queries?: Partial<typeof queriesMock>;
+};
+const renderMaskinporten = ({ queries = queriesMock }: RenderMaskinporten = {}) => {
+  const queryClient = createQueryClientMock();
+  renderWithProviders({ ...queriesMock, ...queries }, queryClient)(<Maskinporten />);
+};
+
+async function waitForLoggedInStatusCheckIsDone() {
+  await waitForElementToBeRemoved(() => screen.queryByTitle(textMock('general.loading')));
+}
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/Maskinporten.tsx b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/Maskinporten.tsx
new file mode 100644
index 00000000000..bb82c7c9501
--- /dev/null
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/Maskinporten.tsx
@@ -0,0 +1,54 @@
+import React, { type ReactNode, type ReactElement } from 'react';
+import { useTranslation } from 'react-i18next';
+import { TabContent } from '../../TabContent';
+import { StudioButton, StudioHeading, StudioParagraph, StudioSpinner } from '@studio/components';
+import { useIsLoggedInWithAnsattportenQuery } from 'app-development/hooks/queries/useIsLoggedInWithAnsattportenQuery';
+import { ScopeList } from './ScopeList';
+
+export const Maskinporten = (): ReactElement => {
+  const { data: isLoggedInWithAnsattporten, isPending: isPendingAuthStatus } =
+    useIsLoggedInWithAnsattportenQuery();
+
+  const { t } = useTranslation();
+
+  const handleLoginWithAnsattporten = (): void => {
+    console.log('Will be implemented in next iteration when backend is ready');
+  };
+
+  if (isPendingAuthStatus) {
+    return <StudioSpinner spinnerTitle={t('general.loading')} />;
+  }
+
+  if (isLoggedInWithAnsattporten) {
+    return (
+      <MaskinportenPageTemplate>
+        <ScopeList />
+      </MaskinportenPageTemplate>
+    );
+  }
+
+  return (
+    <MaskinportenPageTemplate>
+      <StudioParagraph spacing>{t('settings_modal.maskinporten_tab_description')}</StudioParagraph>
+      <StudioButton onClick={handleLoginWithAnsattporten}>
+        {t('settings_modal.maskinporten_tab_login_with_ansattporten')}
+      </StudioButton>
+    </MaskinportenPageTemplate>
+  );
+};
+
+type MaskinportenPageTemplateProps = {
+  children: ReactNode;
+};
+
+const MaskinportenPageTemplate = ({ children }: MaskinportenPageTemplateProps): ReactElement => {
+  const { t } = useTranslation();
+  return (
+    <TabContent>
+      <StudioHeading level={2} size='sm' spacing>
+        {t('settings_modal.maskinporten_tab_title')}
+      </StudioHeading>
+      {children}
+    </TabContent>
+  );
+};
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/ScopeList.module.css b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/ScopeList.module.css
new file mode 100644
index 00000000000..6bb851dcfa5
--- /dev/null
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/ScopeList.module.css
@@ -0,0 +1,3 @@
+.noScopeAlert {
+  margin-top: var(--fds-spacing-8);
+}
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/ScopeList.test.tsx b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/ScopeList.test.tsx
new file mode 100644
index 00000000000..4ac7a327e69
--- /dev/null
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/ScopeList.test.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import { screen, waitForElementToBeRemoved } from '@testing-library/react';
+import { ScopeList } from './ScopeList';
+import { textMock } from '@studio/testing/mocks/i18nMock';
+import { queriesMock } from 'app-shared/mocks/queriesMock';
+import { createQueryClientMock } from 'app-shared/mocks/queryClientMock';
+import { renderWithProviders } from 'app-development/test/mocks';
+import { type MaskinportenScope } from 'app-shared/types/MaskinportenScope';
+
+const scopesMock: MaskinportenScope = {
+  scope: 'label',
+  description: 'description',
+};
+
+describe('ScopeList', () => {
+  it('should display a spinner while loading', () => {
+    renderScopeList();
+    expect(screen.getByTitle(textMock('general.loading'))).toBeInTheDocument();
+  });
+
+  it('should display a list of scopes if scopes are available', async () => {
+    const mockGetMaskinportenScopes = jest
+      .fn()
+      .mockImplementation(() => Promise.resolve([scopesMock]));
+
+    renderScopeList({
+      queries: {
+        getMaskinportenScopes: mockGetMaskinportenScopes,
+      },
+    });
+
+    await waitForGetScopesCheckIsDone();
+
+    expect(
+      screen.getByText('List of scopes and possibility to select scope comes here'),
+    ).toBeInTheDocument();
+  });
+
+  it('should display an alert if no scopes are available', async () => {
+    const mockGetMaskinportenScopes = jest.fn().mockImplementation(() => Promise.resolve([]));
+
+    renderScopeList({
+      queries: {
+        getMaskinportenScopes: mockGetMaskinportenScopes,
+      },
+    });
+    await waitForGetScopesCheckIsDone();
+
+    expect(
+      screen.getByText(textMock('settings_modal.maskinporten_no_scopes_available')),
+    ).toBeInTheDocument();
+  });
+});
+
+type RenderScopeListProps = {
+  queries?: Partial<typeof queriesMock>;
+};
+const renderScopeList = ({ queries = queriesMock }: Partial<RenderScopeListProps> = {}) => {
+  const queryClient = createQueryClientMock();
+
+  renderWithProviders({ ...queriesMock, ...queries }, queryClient)(<ScopeList />);
+};
+
+async function waitForGetScopesCheckIsDone() {
+  await waitForElementToBeRemoved(() => screen.queryByTitle(textMock('general.loading')));
+}
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/ScopeList.tsx b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/ScopeList.tsx
new file mode 100644
index 00000000000..26f9ce6eed0
--- /dev/null
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/ScopeList.tsx
@@ -0,0 +1,25 @@
+import React, { type ReactElement } from 'react';
+import classes from './ScopeList.module.css';
+import { StudioAlert, StudioSpinner } from '@studio/components';
+import { useGetScopesQuery } from 'app-development/hooks/queries/useGetScopesQuery';
+import { useTranslation } from 'react-i18next';
+
+export const ScopeList = (): ReactElement => {
+  const { t } = useTranslation();
+  const { data: scopes, isPending: isPendingScopes } = useGetScopesQuery();
+  const hasScopes: boolean = scopes?.length > 0;
+
+  if (isPendingScopes) {
+    return <StudioSpinner spinnerTitle={t('general.loading')} />;
+  }
+
+  if (hasScopes) {
+    return <div>List of scopes and possibility to select scope comes here</div>;
+  }
+
+  return (
+    <StudioAlert severity='info' className={classes.noScopeAlert}>
+      {t('settings_modal.maskinporten_no_scopes_available')}
+    </StudioAlert>
+  );
+};
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/index.ts b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/index.ts
new file mode 100644
index 00000000000..6f6f1c662c8
--- /dev/null
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/ScopeList/index.ts
@@ -0,0 +1 @@
+export { ScopeList } from './ScopeList';
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/index.ts b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/index.ts
new file mode 100644
index 00000000000..371b8f1a173
--- /dev/null
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/components/Tabs/Maskinporten/index.ts
@@ -0,0 +1 @@
+export { Maskinporten } from './Maskinporten';
diff --git a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/hooks/useSettingsModalMenuTabConfigs.tsx b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/hooks/useSettingsModalMenuTabConfigs.tsx
index 7d598dd3bb8..ef3f0f076f4 100644
--- a/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/hooks/useSettingsModalMenuTabConfigs.tsx
+++ b/frontend/app-development/layout/PageHeader/SubHeader/SettingsModalButton/SettingsModal/hooks/useSettingsModalMenuTabConfigs.tsx
@@ -5,6 +5,7 @@ import {
   SidebarBothIcon,
   ShieldLockIcon,
   TimerStartIcon,
+  CogIcon,
 } from '@studio/icons';
 import { useTranslation } from 'react-i18next';
 import type { StudioContentMenuButtonTabProps } from '@studio/components';
@@ -13,6 +14,7 @@ const aboutTabId: SettingsModalTabId = 'about';
 const setupTabId: SettingsModalTabId = 'setup';
 const policyTabId: SettingsModalTabId = 'policy';
 const accessControlTabId: SettingsModalTabId = 'access_control';
+const maskinportenTabId: SettingsModalTabId = 'maskinporten';
 
 export const useSettingsModalMenuTabConfigs =
   (): StudioContentMenuButtonTabProps<SettingsModalTabId>[] => {
@@ -39,5 +41,10 @@ export const useSettingsModalMenuTabConfigs =
         tabName: t(`settings_modal.left_nav_tab_${accessControlTabId}`),
         icon: <TimerStartIcon />,
       },
+      {
+        tabId: maskinportenTabId,
+        tabName: t(`settings_modal.left_nav_tab_${maskinportenTabId}`),
+        icon: <CogIcon />,
+      },
     ];
   };
diff --git a/frontend/app-development/layout/PageLayout.tsx b/frontend/app-development/layout/PageLayout.tsx
index d4cb27107f5..95ad155c170 100644
--- a/frontend/app-development/layout/PageLayout.tsx
+++ b/frontend/app-development/layout/PageLayout.tsx
@@ -10,13 +10,15 @@ import { NotFoundPage } from './NotFoundPage';
 import { useTranslation } from 'react-i18next';
 import { WebSocketSyncWrapper } from '../components';
 import { PageHeaderContextProvider } from 'app-development/contexts/PageHeaderContext';
+import { useOpenSettingsModalBasedQueryParam } from '../hooks/useOpenSettingsModalBasedQueryParam';
+import { type AxiosError } from 'axios';
+import { type RepoStatus } from 'app-shared/types/RepoStatus';
 
 /**
  * Displays the layout for the app development pages
  */
 export const PageLayout = (): React.ReactNode => {
   const { t } = useTranslation();
-
   const { pathname } = useLocation();
   const match = matchPath({ path: '/:org/:app', caseSensitive: true, end: false }, pathname);
   const { org, app } = match.params;
@@ -41,20 +43,6 @@ export const PageLayout = (): React.ReactNode => {
     );
   }
 
-  const renderPages = () => {
-    if (repoStatusError?.response?.status === ServerCodes.NotFound) {
-      return <NotFoundPage />;
-    }
-    if (repoStatus?.hasMergeConflict) {
-      return <MergeConflictWarning />;
-    }
-    return (
-      <WebSocketSyncWrapper>
-        <Outlet />
-      </WebSocketSyncWrapper>
-    );
-  };
-
   return (
     <>
       <PageHeaderContextProvider user={user} repoOwnerIsOrg={repoOwnerIsOrg}>
@@ -63,7 +51,28 @@ export const PageLayout = (): React.ReactNode => {
           isRepoError={repoStatusError !== null}
         />
       </PageHeaderContextProvider>
-      {renderPages()}
+      <Pages repoStatus={repoStatus} repoStatusError={repoStatusError} />
     </>
   );
 };
+
+type PagesToRenderProps = {
+  repoStatusError: AxiosError;
+  repoStatus: RepoStatus;
+};
+const Pages = ({ repoStatusError, repoStatus }: PagesToRenderProps) => {
+  // Listen to URL-search params and opens settings-modal if params matches.
+  useOpenSettingsModalBasedQueryParam();
+
+  if (repoStatusError?.response?.status === ServerCodes.NotFound) {
+    return <NotFoundPage />;
+  }
+  if (repoStatus?.hasMergeConflict) {
+    return <MergeConflictWarning />;
+  }
+  return (
+    <WebSocketSyncWrapper>
+      <Outlet />
+    </WebSocketSyncWrapper>
+  );
+};
diff --git a/frontend/app-development/types/SettingsModalTabId.ts b/frontend/app-development/types/SettingsModalTabId.ts
index c596b1e0d5b..3f65b015eae 100644
--- a/frontend/app-development/types/SettingsModalTabId.ts
+++ b/frontend/app-development/types/SettingsModalTabId.ts
@@ -1 +1 @@
-export type SettingsModalTabId = 'about' | 'setup' | 'policy' | 'access_control';
+export type SettingsModalTabId = 'about' | 'setup' | 'policy' | 'access_control' | 'maskinporten';
diff --git a/frontend/app-development/utils/metadataUtils.ts b/frontend/app-development/utils/metadataUtils.ts
index 6e31c6ab731..9b0e6fce88d 100644
--- a/frontend/app-development/utils/metadataUtils.ts
+++ b/frontend/app-development/utils/metadataUtils.ts
@@ -3,10 +3,9 @@ import type {
   DataModelMetadataJson,
   DataModelMetadataXsd,
 } from 'app-shared/types/DataModelMetadata';
-import { ArrayUtils, StringUtils } from '@studio/pure-functions';
+import { ArrayUtils, StringUtils, FileNameUtils } from '@studio/pure-functions';
 import type { MetadataOption } from '../types/MetadataOption';
 import type { MetadataOptionsGroup } from '../types/MetadataOptionsGroup';
-import { removeSchemaExtension } from 'app-shared/utils/filenameUtils';
 
 /**
  * Filters out items from the Xsd data list if there are items in the Json data list with the same name.
@@ -43,7 +42,7 @@ export const mergeJsonAndXsdData = (
  * @returns The MetadataOption object.
  */
 export const convertMetadataToOption = (metadata: DataModelMetadata): MetadataOption => {
-  let label = removeSchemaExtension(metadata.fileName);
+  let label = FileNameUtils.removeSchemaExtension(metadata.fileName);
   if (metadata.fileType === '.xsd') {
     label += ' (XSD)';
   }
diff --git a/frontend/dashboard/components/ResourceItem/ResourceItem.test.tsx b/frontend/dashboard/components/ResourceItem/ResourceItem.test.tsx
new file mode 100644
index 00000000000..c6924ae2080
--- /dev/null
+++ b/frontend/dashboard/components/ResourceItem/ResourceItem.test.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { ResourceItem, type ResourceItemProps } from './ResourceItem';
+import { textMock } from '@studio/testing/mocks/i18nMock';
+import '@testing-library/jest-dom';
+import { type Resource } from 'dashboard/types/Resource';
+
+const resourceMock: Resource = {
+  url: 'https://example.com',
+  label: 'test_label',
+  description: 'test_description',
+  icon: <span data-testid='icon'>🔗</span>,
+};
+
+describe('ResourceItem', () => {
+  it('should render the icon, label, and description', () => {
+    renderResourceItem();
+    expect(screen.getByTestId('icon')).toBeInTheDocument();
+    const linkElement = screen.getByRole('link', { name: textMock(resourceMock.label) });
+    expect(linkElement).toBeInTheDocument();
+    expect(screen.getByText(textMock(resourceMock.description))).toBeInTheDocument();
+  });
+
+  it('should set the correct href and attributes on the link', () => {
+    renderResourceItem();
+
+    const linkElement = screen.getByRole('link', { name: textMock(resourceMock.label) });
+    expect(linkElement).toHaveAttribute('href', resourceMock.url);
+    expect(linkElement).toHaveAttribute('target', '_blank');
+    expect(linkElement).toHaveAttribute('rel', 'noopener noreferrer');
+  });
+});
+
+const renderResourceItem = (props: Partial<ResourceItemProps> = {}) =>
+  render(<ResourceItem resource={{ ...resourceMock, ...props.resource }} />);
diff --git a/frontend/dashboard/components/ResourceItem/ResourceItem.tsx b/frontend/dashboard/components/ResourceItem/ResourceItem.tsx
index ffb19745057..5de084b185e 100644
--- a/frontend/dashboard/components/ResourceItem/ResourceItem.tsx
+++ b/frontend/dashboard/components/ResourceItem/ResourceItem.tsx
@@ -1,24 +1,24 @@
-import type { ReactNode } from 'react';
+import type { ReactElement } from 'react';
 import React from 'react';
 import classes from './ResourceItem.module.css';
 import { useTranslation } from 'react-i18next';
+import { StudioLink } from '@studio/components';
+import { type Resource } from 'dashboard/types/Resource';
 
-export interface ResourceItemProps {
-  link: string;
-  label: string;
-  description: string;
-  icon: ReactNode;
-}
+export type ResourceItemProps = {
+  resource: Resource;
+};
 
-export function ResourceItem({ link, label, description, icon }: ResourceItemProps) {
+export function ResourceItem({ resource }: ResourceItemProps): ReactElement {
   const { t } = useTranslation();
+  const { url, label, description, icon } = resource;
   return (
     <div className={classes.resourceItem}>
       <div>{icon}</div>
       <div>
-        <a href={link} target='_blank' rel='noopener noreferrer'>
+        <StudioLink href={url} target='_blank' rel='noopener noreferrer'>
           {t(label)}
-        </a>
+        </StudioLink>
         <p style={{ marginTop: 0 }}>{t(description)}</p>
       </div>
     </div>
diff --git a/frontend/dashboard/components/Resources/Resources.tsx b/frontend/dashboard/components/Resources/Resources.tsx
index c06e39bd549..238ebebe6ca 100644
--- a/frontend/dashboard/components/Resources/Resources.tsx
+++ b/frontend/dashboard/components/Resources/Resources.tsx
@@ -1,220 +1,59 @@
-import React from 'react';
+import React, { type ReactElement } from 'react';
 import { ResourceItem } from '../ResourceItem';
 import classes from './Resources.module.css';
 import { useTranslation } from 'react-i18next';
-import { StudioHeading } from '@studio/components';
+import {
+  OrgResourceIcon,
+  DocsResourceIcon,
+  ContactResourceIcon,
+  DesignResourceIcon,
+  RoadmapResourceIcon,
+  OperationStatusResourceIcon,
+} from '@studio/icons';
 import { altinnDocsUrl } from 'app-shared/ext-urls';
-
-interface Resource {
-  label: string;
-  description: string;
-  url: string;
-  icon: React.ReactNode;
-}
+import { StudioHeading } from '@studio/components';
+import { type Resource } from 'dashboard/types/Resource';
 
 const resources: Resource[] = [
   {
     label: 'dashboard.resource_docs_label',
     description: 'dashboard.resource_docs_description',
-    url: 'https://docs.altinn.studio',
-    icon: (
-      <svg
-        width='60'
-        height='60'
-        viewBox='0 0 60 60'
-        fill='none'
-        xmlns='http://www.w3.org/2000/svg'
-      >
-        <circle cx='30' cy='30' r='30' fill='#022F51' />
-        <path
-          d='M41 44H20V16H41V44ZM21.2353 42.7826H39.7647V17.2174H21.2353V42.7826Z'
-          fill='#FFFEFE'
-        />
-        <path
-          d='M24.9412 26.9565H36.0588V28.1739H24.9412V26.9565ZM24.9412 22.0869H31.1176V23.3043H24.9412V22.0869ZM24.9412 31.8261H36.0588V33.0435H24.9412V31.8261ZM24.9412 36.6956H36.0588V37.913H24.9412V36.6956Z'
-          fill='#FFFEFE'
-        />
-      </svg>
-    ),
+    url: altinnDocsUrl(),
+    icon: <DocsResourceIcon width='60' height='60' />,
   },
   {
     label: 'dashboard.resource_organisations_label',
     description: 'dashboard.resource_organisations_description',
     url: `${window.location.origin}/repos/explore/organizations`,
-    icon: (
-      <svg
-        width='60'
-        height='60'
-        viewBox='0 0 60 60'
-        fill='none'
-        xmlns='http://www.w3.org/2000/svg'
-      >
-        <ellipse cx='30' cy='29.7794' rx='30' ry='29.7794' fill='#022F51' />
-        <path
-          d='M18.294 35.875V26.749H16.458V35.875H18.294ZM18.348 24.949V23.005H16.404V24.949H18.348ZM29.2141 35.875L25.6501 30.331L28.8181 26.749H26.5861L23.0401 30.961V23.059H21.2041V35.875H23.0401V33.193L24.3901 31.663L26.9461 35.875H29.2141ZM37.5267 31.303C37.5267 29.773 37.3107 28.621 36.4467 27.721C35.8527 27.109 34.9527 26.641 33.7107 26.641C32.4687 26.641 31.5867 27.109 30.9927 27.721C30.1287 28.621 29.9127 29.773 29.9127 31.303C29.9127 32.851 30.1287 34.003 30.9927 34.903C31.5867 35.515 32.4687 35.983 33.7107 35.983C34.9527 35.983 35.8527 35.515 36.4467 34.903C37.3107 34.003 37.5267 32.851 37.5267 31.303ZM35.6907 31.303C35.6907 32.293 35.6187 33.247 35.0607 33.805C34.7187 34.147 34.2507 34.345 33.7107 34.345C33.1707 34.345 32.7207 34.147 32.3787 33.805C31.8207 33.247 31.7487 32.293 31.7487 31.303C31.7487 30.313 31.8207 29.359 32.3787 28.801C32.7207 28.459 33.1707 28.279 33.7107 28.279C34.2507 28.279 34.7187 28.459 35.0607 28.801C35.6187 29.359 35.6907 30.313 35.6907 31.303ZM47.4107 35.875V30.043C47.4107 29.017 47.1947 28.153 46.4927 27.469C45.9527 26.947 45.1787 26.641 44.2427 26.641C43.3247 26.641 42.4427 26.983 41.8127 27.667V26.749H40.0127V35.875H41.8487V30.313C41.8487 28.909 42.7127 28.279 43.7387 28.279C44.7647 28.279 45.5747 28.891 45.5747 30.313V35.875H47.4107Z'
-          fill='#022F51'
-        />
-        <path
-          d='M44 42H42.7273V15.2727H28.7273V42H27.4545V25.4545H17.2727V42H16V24.1818H27.4545V14H44V42Z'
-          fill='#FFFEFE'
-        />
-        <path
-          d='M37.6364 19.0909H38.9091V42H37.6364V19.0909ZM32.5455 19.0909H33.8182V42H32.5455V19.0909ZM21.0909 30.5454H24.9091V31.8182H21.0909V30.5454ZM21.0909 35.6363H24.9091V36.9091H21.0909V35.6363ZM21.0909 40.7272H24.9091V42H21.0909V40.7272Z'
-          fill='#FFFEFE'
-        />
-      </svg>
-    ),
+    icon: <OrgResourceIcon width='60' height='60' />,
   },
   {
     label: 'dashboard.resource_contact_label',
     description: 'dashboard.resource_contact_description',
     url: 'https://altinn.studio/contact',
-    icon: (
-      <svg
-        width='60'
-        height='60'
-        viewBox='0 0 60 60'
-        fill='none'
-        xmlns='http://www.w3.org/2000/svg'
-      >
-        <circle cx='30' cy='30' r='30' fill='#022F51' />
-        <path
-          d='M21.303 33.9574C21.303 35.6919 19.886 37.1089 18.1515 37.1089C16.4169 37.1089 15 35.6919 15 33.9574C15 32.2229 16.4169 30.8059 18.1515 30.8059H21.303V33.9574Z'
-          fill='#E01E5A'
-        />
-        <path
-          d='M22.8909 33.9574C22.8909 32.2229 24.3078 30.8059 26.0424 30.8059C27.7769 30.8059 29.1938 32.2229 29.1938 33.9574V41.8483C29.1938 43.5829 27.7769 44.9998 26.0424 44.9998C24.3078 44.9998 22.8909 43.5829 22.8909 41.8483V33.9574Z'
-          fill='#E01E5A'
-        />
-        <path
-          d='M26.0424 21.303C24.3078 21.303 22.8909 19.886 22.8909 18.1515C22.8909 16.4169 24.3078 15 26.0424 15C27.7769 15 29.1938 16.4169 29.1938 18.1515V21.303H26.0424Z'
-          fill='#36C5F0'
-        />
-        <path
-          d='M26.0424 22.8906C27.777 22.8906 29.1939 24.3076 29.1939 26.0421C29.1939 27.7767 27.777 29.1936 26.0424 29.1936H18.1515C16.4169 29.1936 15 27.7767 15 26.0421C15 24.3076 16.4169 22.8906 18.1515 22.8906H26.0424Z'
-          fill='#36C5F0'
-        />
-        <path
-          d='M38.6973 26.0421C38.6973 24.3076 40.1142 22.8906 41.8488 22.8906C43.5833 22.8906 45.0002 24.3076 45.0002 26.0421C45.0002 27.7767 43.5833 29.1936 41.8488 29.1936H38.6973V26.0421Z'
-          fill='#2EB67D'
-        />
-        <path
-          d='M37.1094 26.0424C37.1094 27.777 35.6924 29.1939 33.9579 29.1939C32.2233 29.1939 30.8064 27.777 30.8064 26.0424V18.1515C30.8064 16.4169 32.2233 15 33.9579 15C35.6924 15 37.1094 16.4169 37.1094 18.1515V26.0424Z'
-          fill='#2EB67D'
-        />
-        <path
-          d='M33.9579 38.6973C35.6924 38.6973 37.1094 40.1142 37.1094 41.8488C37.1094 43.5833 35.6924 45.0002 33.9579 45.0002C32.2233 45.0002 30.8064 43.5833 30.8064 41.8488V38.6973H33.9579Z'
-          fill='#ECB22E'
-        />
-        <path
-          d='M33.9579 37.1094C32.2233 37.1094 30.8064 35.6924 30.8064 33.9579C30.8064 32.2233 32.2233 30.8064 33.9579 30.8064H41.8488C43.5834 30.8064 45.0003 32.2233 45.0003 33.9579C45.0003 35.6924 43.5834 37.1094 41.8488 37.1094H33.9579Z'
-          fill='#ECB22E'
-        />
-      </svg>
-    ),
+    icon: <ContactResourceIcon width='60' height='60' />,
   },
   {
     label: 'dashboard.resource_design_label',
     description: 'dashboard.resource_design_description',
     url: 'https://www.figma.com/file/wnBveAG2ikUspFsQwM3GNE/Prototyping-av-skjematjenester?node-id=47%3A4068',
-    icon: (
-      <svg
-        width='60'
-        height='60'
-        viewBox='0 0 60 60'
-        fill='none'
-        xmlns='http://www.w3.org/2000/svg'
-      >
-        <circle cx='30' cy='30' r='30' fill='#022F51' />
-        <path
-          d='M18.294 36V26.874H16.458V36H18.294ZM18.348 25.074V23.13H16.404V25.074H18.348ZM29.2141 36L25.6501 30.456L28.8181 26.874H26.5861L23.0401 31.086V23.184H21.2041V36H23.0401V33.318L24.3901 31.788L26.9461 36H29.2141ZM37.5267 31.428C37.5267 29.898 37.3107 28.746 36.4467 27.846C35.8527 27.234 34.9527 26.766 33.7107 26.766C32.4687 26.766 31.5867 27.234 30.9927 27.846C30.1287 28.746 29.9127 29.898 29.9127 31.428C29.9127 32.976 30.1287 34.128 30.9927 35.028C31.5867 35.64 32.4687 36.108 33.7107 36.108C34.9527 36.108 35.8527 35.64 36.4467 35.028C37.3107 34.128 37.5267 32.976 37.5267 31.428ZM35.6907 31.428C35.6907 32.418 35.6187 33.372 35.0607 33.93C34.7187 34.272 34.2507 34.47 33.7107 34.47C33.1707 34.47 32.7207 34.272 32.3787 33.93C31.8207 33.372 31.7487 32.418 31.7487 31.428C31.7487 30.438 31.8207 29.484 32.3787 28.926C32.7207 28.584 33.1707 28.404 33.7107 28.404C34.2507 28.404 34.7187 28.584 35.0607 28.926C35.6187 29.484 35.6907 30.438 35.6907 31.428ZM47.4107 36V30.168C47.4107 29.142 47.1947 28.278 46.4927 27.594C45.9527 27.072 45.1787 26.766 44.2427 26.766C43.3247 26.766 42.4427 27.108 41.8127 27.792V26.874H40.0127V36H41.8487V30.438C41.8487 29.034 42.7127 28.404 43.7387 28.404C44.7647 28.404 45.5747 29.016 45.5747 30.438V36H47.4107Z'
-          fill='#022F51'
-        />
-        <path
-          d='M24.9333 45.0001C27.6564 45.0001 29.8665 42.7601 29.8665 40V35H24.9333C22.2101 35 20 37.24 20 40C20 42.7601 22.2101 45.0001 24.9333 45.0001Z'
-          fill='#0ACF83'
-        />
-        <path
-          d='M20 30C20 27.24 22.2101 25 24.9333 25H29.8665V35.0001H24.9333C22.2101 35.0001 20 32.7601 20 30Z'
-          fill='#A259FF'
-        />
-        <path
-          d='M20 20C20 17.24 22.2101 15 24.9333 15H29.8665V25.0001H24.9333C22.2101 25.0001 20 22.7601 20 20Z'
-          fill='#F24E1E'
-        />
-        <path
-          d='M29.8667 15H34.8C37.5231 15 39.7332 17.24 39.7332 20C39.7332 22.7601 37.5231 25.0001 34.8 25.0001H29.8667V15Z'
-          fill='#FF7262'
-        />
-        <path
-          d='M39.7332 30C39.7332 32.7601 37.5231 35.0001 34.8 35.0001C32.0768 35.0001 29.8667 32.7601 29.8667 30C29.8667 27.24 32.0768 25 34.8 25C37.5231 25 39.7332 27.24 39.7332 30Z'
-          fill='#1ABCFE'
-        />
-      </svg>
-    ),
+    icon: <DesignResourceIcon width='60' height='60' />,
   },
   {
     label: 'dashboard.resource_roadmap_label',
     description: 'dashboard.resource_roadmap_description',
     url: altinnDocsUrl({ relativeUrl: 'community/roadmap/' }),
-    icon: (
-      <svg
-        width='60'
-        height='60'
-        viewBox='0 0 60 60'
-        fill='none'
-        xmlns='http://www.w3.org/2000/svg'
-      >
-        <circle cx='30' cy='30' r='30' fill='#022F51' />
-        <path
-          d='M24.9692 31.011H26.2V44.5588H24.9692V31.011ZM24.9692 15H26.2V19.9265H24.9692V15ZM39.2462 31.011H15V21.1581H39.1231L47 26.0845L39.2462 31.011V31.011ZM16.2308 29.7794H38.8769L44.6615 26.0845L38.7538 22.3897H16.2308V29.7794Z'
-          fill='white'
-        />
-      </svg>
-    ),
+    icon: <RoadmapResourceIcon width='60' height='60' />,
   },
   {
     label: 'dashboard.resource_status_label',
     description: 'dashboard.resource_status_description',
     url: 'https://status.digdir.no/',
-    icon: (
-      <svg
-        width='60'
-        height='60'
-        viewBox='0 0 60 60'
-        fill='none'
-        xmlns='http://www.w3.org/2000/svg'
-      >
-        <ellipse cx='30' cy='29.7794' rx='30' ry='29.7794' fill='#022F51' />
-        <path
-          d='M18.294 35.875V26.749H16.458V35.875H18.294ZM18.348 24.949V23.005H16.404V24.949H18.348ZM29.2141 35.875L25.6501 30.331L28.8181 26.749H26.5861L23.0401 30.961V23.059H21.2041V35.875H23.0401V33.193L24.3901 31.663L26.9461 35.875H29.2141ZM37.5267 31.303C37.5267 29.773 37.3107 28.621 36.4467 27.721C35.8527 27.109 34.9527 26.641 33.7107 26.641C32.4687 26.641 31.5867 27.109 30.9927 27.721C30.1287 28.621 29.9127 29.773 29.9127 31.303C29.9127 32.851 30.1287 34.003 30.9927 34.903C31.5867 35.515 32.4687 35.983 33.7107 35.983C34.9527 35.983 35.8527 35.515 36.4467 34.903C37.3107 34.003 37.5267 32.851 37.5267 31.303ZM35.6907 31.303C35.6907 32.293 35.6187 33.247 35.0607 33.805C34.7187 34.147 34.2507 34.345 33.7107 34.345C33.1707 34.345 32.7207 34.147 32.3787 33.805C31.8207 33.247 31.7487 32.293 31.7487 31.303C31.7487 30.313 31.8207 29.359 32.3787 28.801C32.7207 28.459 33.1707 28.279 33.7107 28.279C34.2507 28.279 34.7187 28.459 35.0607 28.801C35.6187 29.359 35.6907 30.313 35.6907 31.303ZM47.4107 35.875V30.043C47.4107 29.017 47.1947 28.153 46.4927 27.469C45.9527 26.947 45.1787 26.641 44.2427 26.641C43.3247 26.641 42.4427 26.983 41.8127 27.667V26.749H40.0127V35.875H41.8487V30.313C41.8487 28.909 42.7127 28.279 43.7387 28.279C44.7647 28.279 45.5747 28.891 45.5747 30.313V35.875H47.4107Z'
-          fill='#022F51'
-        />
-        <path
-          d='M28.3501 36.7166C30.9167 35.7833 33.6001 34.2666 35.8167 31.9333C40.1334 27.6166 42.0001 22.1333 41.1834 17.6999C36.7501 16.8833 31.2667 18.7499 26.9501 23.0666C24.6167 25.3999 23.1001 27.9666 22.1667 30.5333L28.3501 36.7166Z'
-          stroke='white'
-          strokeMiterlimit='10'
-        />
-        <path d='M18.9 33.8L15.6333 37.1834' stroke='white' strokeMiterlimit='10' />
-        <path d='M22.1668 37.1833L17.2668 42.0834' stroke='white' strokeMiterlimit='10' />
-        <path d='M25.4334 40.45L22.1667 43.7166' stroke='white' strokeMiterlimit='10' />
-        <path
-          d='M28.0002 22.1332C24.8502 21.8999 21.5835 22.9499 19.0168 25.1666L22.7502 28.8999'
-          stroke='white'
-          strokeMiterlimit='10'
-        />
-        <path
-          d='M29.9835 36.25L33.7169 39.9833C35.9335 37.4166 36.9835 34.15 36.7502 30.8833'
-          stroke='white'
-          strokeMiterlimit='10'
-        />
-        <path d='M30.4501 20.3833L38.5001 28.4333' stroke='white' strokeMiterlimit='10' />
-      </svg>
-    ),
+    icon: <OperationStatusResourceIcon width='60' height='60' />,
   },
 ];
 
-export function Resources() {
+export function Resources(): ReactElement {
   const { t } = useTranslation();
   return (
     <div className={classes.wrapper}>
@@ -222,14 +61,8 @@ export function Resources() {
         {t('dashboard.resources')}
       </StudioHeading>
       <div className={classes.resourcesContainer}>
-        {resources.map((resource, index) => (
-          <ResourceItem
-            key={`resource-item-${index}`}
-            label={resource.label}
-            description={resource.description}
-            link={resource.url}
-            icon={resource.icon}
-          />
+        {resources.map((resource: Resource, index: number) => (
+          <ResourceItem key={`resource-item-${index}`} resource={resource} />
         ))}
       </div>
     </div>
diff --git a/frontend/dashboard/types/Resource.ts b/frontend/dashboard/types/Resource.ts
new file mode 100644
index 00000000000..ca5615bee2f
--- /dev/null
+++ b/frontend/dashboard/types/Resource.ts
@@ -0,0 +1,8 @@
+import { type ReactNode } from 'react';
+
+export type Resource = {
+  label: string;
+  description: string;
+  url: string;
+  icon: ReactNode;
+};
diff --git a/frontend/language/src/nb.json b/frontend/language/src/nb.json
index 8d0bab49c9e..753b2f4ea4d 100644
--- a/frontend/language/src/nb.json
+++ b/frontend/language/src/nb.json
@@ -7,6 +7,7 @@
   "api_errors.DM_CsharpCompiler_NameCollision": "Navnet <bold>{{nodeName}}</bold> er det samme som på et overordnet element. Gi ett av elementene et annet navn.",
   "api_errors.GT_01": "Det er en konflikt i appen",
   "api_errors.GT_03": "Du blir logget ut fordi økten din har utløpt. Logg inn på nytt.",
+  "api_errors.InvalidOptionsFormat": "Kodelisten har ugyldig format.",
   "api_errors.ModelWithTheSameTypeNameExists": "Det er allerede et skjema som produserer modellen med navnet du har oppgitt",
   "api_errors.ResourceNotFound": "Fant ikke en fil som appen din prøvde å få tak i.",
   "api_errors.Unauthorized": "Handlingen du prøver å utføre krever rettigheter du ikke har. Du blir nå logget ut.",
@@ -1001,9 +1002,14 @@
   "settings_modal.heading": "Innstillinger",
   "settings_modal.left_nav_tab_about": "Om appen",
   "settings_modal.left_nav_tab_access_control": "Oppstartskontroll",
+  "settings_modal.left_nav_tab_maskinporten": "Maskinporten",
   "settings_modal.left_nav_tab_policy": "Tilganger",
   "settings_modal.left_nav_tab_setup": "Oppsett",
   "settings_modal.loading_content": "Laster inn data",
+  "settings_modal.maskinporten_no_scopes_available": "Du har ingen tilgjengelige scopes å velge mellom fordi din bruker ikke er tilknyttet noen scopes i Maskinporten.",
+  "settings_modal.maskinporten_tab_description": "For å hente tilgjengelige scopes må du verifisere deg med Ansattporten",
+  "settings_modal.maskinporten_tab_login_with_ansattporten": "Logg inn med Ansattporten",
+  "settings_modal.maskinporten_tab_title": "Håndtering av Scopes fra Maskinporten",
   "settings_modal.policy_tab_heading": "Tilganger",
   "settings_modal.setup_tab_heading": "Oppsett",
   "settings_modal.setup_tab_switch_autoDeleteOnProcessEnd": "Automatisk sletting etter innsending",
@@ -1434,7 +1440,6 @@
   "ux_editor.component_title.InstanceInformation": "Informasjon om eksemplaret",
   "ux_editor.component_title.InstantiationButton": "Start eksemplar",
   "ux_editor.component_title.Likert": "Likert-skala",
-  "ux_editor.component_title.LikertItem": "Likertelement",
   "ux_editor.component_title.Link": "Lenke",
   "ux_editor.component_title.List": "Liste",
   "ux_editor.component_title.Map": "Stedfeste i kart",
@@ -1463,9 +1468,6 @@
   "ux_editor.config.warning_duplicates.solution_studio_import": "Gå tilbake til Altinn Studio og velg 'Hent endringer' for å laste inn endringene du har gjort i koden.",
   "ux_editor.container_empty": "Tomt, dra noe inn her...",
   "ux_editor.container_not_editable_info": "Noen egenskaper for denne komponenten er ikke redigerbare for øyeblikket. Du kan legge til underkomponenter i kolonnen til venstre.",
-  "ux_editor.create.subform": "Nytt underskjema",
-  "ux_editor.create.subform.confirm_button": "Opprett underskjema",
-  "ux_editor.create.subform.label": "Navn på underskjema",
   "ux_editor.delete.subform": "Slett underskjema",
   "ux_editor.delete.subform.confirm": "Er du sikker på at du vil slette dette underskjemaet?",
   "ux_editor.edit_component.loading_schema": "Laster inn skjema",
diff --git a/frontend/libs/studio-components/package.json b/frontend/libs/studio-components/package.json
index be9b39569c2..b10b4ab17dc 100644
--- a/frontend/libs/studio-components/package.json
+++ b/frontend/libs/studio-components/package.json
@@ -33,7 +33,7 @@
     "@testing-library/react": "16.0.1",
     "@types/jest": "^29.5.5",
     "eslint": "8.57.1",
-    "eslint-plugin-storybook": "^0.9.0",
+    "eslint-plugin-storybook": "^0.11.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "storybook": "^8.0.4",
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTable.stories.tsx b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTable.stories.tsx
new file mode 100644
index 00000000000..e3b2e335979
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTable.stories.tsx
@@ -0,0 +1,67 @@
+import React, { useState } from 'react';
+import type { Meta, StoryFn } from '@storybook/react';
+import { StudioCheckboxTable } from './index';
+import { type StudioCheckboxTableRowElement } from './types/StudioCheckboxTableRowElement';
+
+const options: StudioCheckboxTableRowElement[] = [
+  {
+    value: 'Value1',
+    label: 'Label1',
+    description: 'Description',
+    checked: false,
+  },
+  { value: 'Value2', label: 'Label2', checked: true },
+  { value: 'Value3', label: 'Label3', checked: false },
+];
+
+const PreviewComponent = (args): React.ReactElement => {
+  const [rowElements, setRowElements] = useState<StudioCheckboxTableRowElement[]>(options);
+
+  const areAllChecked = rowElements.every((element) => element.checked);
+  const isAnyChecked = rowElements.some((element) => element.checked);
+
+  return (
+    <StudioCheckboxTable {...args}>
+      <StudioCheckboxTable.Header
+        title='Title'
+        checked={areAllChecked}
+        indeterminate={isAnyChecked && !areAllChecked}
+        onChange={() =>
+          setRowElements(rowElements.map((element) => ({ ...element, checked: !areAllChecked })))
+        }
+      />
+      <StudioCheckboxTable.Body>
+        {rowElements.map((rowElement: StudioCheckboxTableRowElement) => (
+          <StudioCheckboxTable.Row
+            key={rowElement.value}
+            rowElement={rowElement}
+            onChange={(event) => {
+              const clickedValue = event.target.value;
+
+              // Update the clicked rowElement's `checked` value
+              setRowElements((prevRowElements) =>
+                prevRowElements.map((element) =>
+                  element.value === clickedValue
+                    ? { ...element, checked: !element.checked }
+                    : element,
+                ),
+              );
+            }}
+          />
+        ))}
+      </StudioCheckboxTable.Body>
+    </StudioCheckboxTable>
+  );
+};
+
+type Story = StoryFn<typeof StudioCheckboxTable>;
+
+const meta: Meta = {
+  title: 'Components/StudioCheckboxTable',
+  component: PreviewComponent,
+};
+export const Preview: Story = (args): React.ReactElement => <PreviewComponent {...args} />;
+
+Preview.args = {};
+
+export default meta;
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTable.test.tsx b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTable.test.tsx
new file mode 100644
index 00000000000..948e46f3bfe
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTable.test.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { StudioCheckboxTable, type StudioCheckboxTableProps } from './StudioCheckboxTable';
+import { testRootClassNameAppending } from '../../test-utils/testRootClassNameAppending';
+
+describe('StudioPageHeader', () => {
+  it('should render the children passed to it', () => {
+    renderStudioCheckboxTable();
+
+    expect(screen.getByText(childrenTextMock)).toBeInTheDocument();
+  });
+
+  it('appends given classname to internal classname', () => {
+    testRootClassNameAppending((className) => renderStudioCheckboxTable({ className }));
+  });
+});
+
+const childrenTextMock: string = 'text';
+const defaultProps: StudioCheckboxTableProps = {
+  children: (
+    <tbody>
+      <tr>
+        <td>{childrenTextMock}</td>
+      </tr>
+    </tbody>
+  ),
+};
+
+const renderStudioCheckboxTable = (props: Partial<StudioCheckboxTableProps> = {}) => {
+  return render(<StudioCheckboxTable {...defaultProps} {...props} />);
+};
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTable.tsx b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTable.tsx
new file mode 100644
index 00000000000..1ec5d24ed0f
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTable.tsx
@@ -0,0 +1,11 @@
+import React, { type ReactElement } from 'react';
+import { StudioTable, type StudioTableProps } from '../StudioTable';
+
+export type StudioCheckboxTableProps = StudioTableProps;
+
+export const StudioCheckboxTable = ({
+  className,
+  children,
+}: StudioCheckboxTableProps): ReactElement => {
+  return <StudioTable className={className}>{children}</StudioTable>;
+};
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableBody/StudioCheckboxTableBody.test.tsx b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableBody/StudioCheckboxTableBody.test.tsx
new file mode 100644
index 00000000000..ee9b339f4e0
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableBody/StudioCheckboxTableBody.test.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import {
+  StudioCheckboxTableBody,
+  type StudioCheckboxTableBodyProps,
+} from './StudioCheckboxTableBody';
+import { StudioCheckboxTableRow } from '../StudioCheckboxTableRow';
+import { rowElementMocks } from '../mocks';
+import { type StudioCheckboxTableRowElement } from '../types/StudioCheckboxTableRowElement';
+
+describe('StudioCheckboxTableBody', () => {
+  it('should render multiple children elements', () => {
+    renderStudioCheckboxTableBody({
+      children: rowElementMocks.map((rowElement: StudioCheckboxTableRowElement) => (
+        <StudioCheckboxTableRow
+          key={rowElement.value}
+          rowElement={rowElement}
+          onChange={jest.fn()}
+        />
+      )),
+    });
+
+    expect(screen.getAllByRole('checkbox')).toHaveLength(2);
+
+    rowElementMocks.forEach((rowElement: StudioCheckboxTableRowElement) => {
+      expect(screen.getByRole('checkbox', { name: rowElement.label }));
+      expect(screen.getByText(rowElement.description));
+    });
+    expect(screen.getByRole('checkbox', { name: rowElementMocks[0].label })).not.toBeChecked();
+    expect(screen.getByRole('checkbox', { name: rowElementMocks[1].label })).toBeChecked();
+  });
+});
+
+const renderStudioCheckboxTableBody = (props: StudioCheckboxTableBodyProps) => {
+  return render(
+    <table>
+      <StudioCheckboxTableBody {...props} />
+    </table>,
+  );
+};
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableBody/StudioCheckboxTableBody.tsx b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableBody/StudioCheckboxTableBody.tsx
new file mode 100644
index 00000000000..37cefac5b87
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableBody/StudioCheckboxTableBody.tsx
@@ -0,0 +1,13 @@
+import React, { type ReactElement } from 'react';
+import { StudioTable } from '../../StudioTable';
+import { type StudioCheckboxTableRowProps } from '../StudioCheckboxTableRow/StudioCheckboxTableRow';
+
+export type StudioCheckboxTableBodyProps = {
+  children: ReactElement<StudioCheckboxTableRowProps>[];
+};
+
+export const StudioCheckboxTableBody = ({
+  children,
+}: StudioCheckboxTableBodyProps): ReactElement => {
+  return <StudioTable.Body>{children}</StudioTable.Body>;
+};
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableBody/index.ts b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableBody/index.ts
new file mode 100644
index 00000000000..d33d2796ffd
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableBody/index.ts
@@ -0,0 +1 @@
+export { StudioCheckboxTableBody } from './StudioCheckboxTableBody';
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/StudioCheckboxTableHeader.module.css b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/StudioCheckboxTableHeader.module.css
new file mode 100644
index 00000000000..78ee0bad4a2
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/StudioCheckboxTableHeader.module.css
@@ -0,0 +1,3 @@
+.header {
+  background-color: var(--fds-colors-grey-100);
+}
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/StudioCheckboxTableHeader.test.tsx b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/StudioCheckboxTableHeader.test.tsx
new file mode 100644
index 00000000000..282f2b76856
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/StudioCheckboxTableHeader.test.tsx
@@ -0,0 +1,71 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import {
+  StudioCheckboxTableHeader,
+  type StudioCheckboxTableHeaderProps,
+} from './StudioCheckboxTableHeader';
+
+describe('StudioCheckboxTableHeader', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render the checkbox with the correct label and state', () => {
+    renderStudioCheckboxTableHeader();
+
+    const checkbox = screen.getByRole('checkbox', { name: titleMock });
+    expect(checkbox).toBeInTheDocument();
+  });
+
+  it('should render the checkbox as checked when "checked" is true', () => {
+    renderStudioCheckboxTableHeader({ checked: true });
+
+    const checkbox = screen.getByRole('checkbox', { name: titleMock });
+    expect(checkbox).toBeChecked();
+  });
+
+  it('should render the checkbox as not checked when "checked" is false', () => {
+    renderStudioCheckboxTableHeader({ checked: false });
+
+    const checkbox = screen.getByRole('checkbox', { name: titleMock });
+    expect(checkbox).not.toBeChecked();
+  });
+
+  it('should render the title as a separate header cell', () => {
+    renderStudioCheckboxTableHeader();
+
+    const headerCell = screen.getByText(titleMock);
+    expect(headerCell).toBeInTheDocument();
+    expect(headerCell).toHaveAttribute('aria-hidden', 'true');
+  });
+
+  it('should call onChange when the checkbox is clicked', async () => {
+    const user = userEvent.setup();
+    const mockOnChange = jest.fn();
+    renderStudioCheckboxTableHeader({ checked: false, onChange: mockOnChange });
+
+    const checkbox = screen.getByRole('checkbox', { name: titleMock });
+    expect(checkbox).not.toBeChecked();
+    await user.click(checkbox);
+
+    expect(mockOnChange).toHaveBeenCalledTimes(1);
+  });
+});
+
+const titleMock: string = 'Title';
+
+const defaultProps: StudioCheckboxTableHeaderProps = {
+  title: titleMock,
+  checked: false,
+  indeterminate: false,
+  onChange: jest.fn(),
+};
+
+const renderStudioCheckboxTableHeader = (props: Partial<StudioCheckboxTableHeaderProps> = {}) => {
+  render(
+    <table>
+      <StudioCheckboxTableHeader {...defaultProps} {...props} />
+    </table>,
+  );
+};
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/StudioCheckboxTableHeader.tsx b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/StudioCheckboxTableHeader.tsx
new file mode 100644
index 00000000000..028d455a727
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/StudioCheckboxTableHeader.tsx
@@ -0,0 +1,39 @@
+import React, { type ChangeEvent, type ReactElement } from 'react';
+import classes from './StudioCheckboxTableHeader.module.css';
+import { StudioTable } from '../../StudioTable';
+import { StudioCheckbox } from '../../StudioCheckbox';
+
+export type StudioCheckboxTableHeaderProps = {
+  title: string;
+  checked: boolean;
+  indeterminate: boolean;
+  onChange: (event: ChangeEvent<HTMLInputElement>) => void;
+};
+
+export const StudioCheckboxTableHeader = ({
+  title,
+  checked,
+  indeterminate,
+  onChange,
+}: StudioCheckboxTableHeaderProps): ReactElement => {
+  return (
+    <StudioTable.Head>
+      <StudioTable.Row>
+        <StudioTable.HeaderCell className={classes.header}>
+          <StudioCheckbox
+            aria-label={title}
+            checked={checked}
+            indeterminate={indeterminate}
+            onChange={onChange}
+            aria-checked
+            size='sm'
+            value='all'
+          />
+        </StudioTable.HeaderCell>
+        <StudioTable.HeaderCell className={classes.header} aria-hidden>
+          {title}
+        </StudioTable.HeaderCell>
+      </StudioTable.Row>
+    </StudioTable.Head>
+  );
+};
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/index.ts b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/index.ts
new file mode 100644
index 00000000000..1d3176aba51
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableHeader/index.ts
@@ -0,0 +1 @@
+export { StudioCheckboxTableHeader } from './StudioCheckboxTableHeader';
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/StudioCheckboxTableRow.module.css b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/StudioCheckboxTableRow.module.css
new file mode 100644
index 00000000000..47482c8e3a5
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/StudioCheckboxTableRow.module.css
@@ -0,0 +1,11 @@
+.checkboxCell {
+  padding-right: var(--fds-spacing-8);
+}
+
+.descriptionText {
+  color: var(--fds-semantic-text-neutral-subtle);
+}
+
+.chexboxTextContent {
+  width: 100%;
+}
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/StudioCheckboxTableRow.test.tsx b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/StudioCheckboxTableRow.test.tsx
new file mode 100644
index 00000000000..f6a3f1cd4b0
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/StudioCheckboxTableRow.test.tsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { StudioCheckboxTableRow, type StudioCheckboxTableRowProps } from './StudioCheckboxTableRow';
+import { rowElementMock1 } from '../mocks';
+
+describe('StudioCheckboxTableRow', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render the checkbox with the correct label and description', () => {
+    renderStudioCheckboxTableRow();
+
+    expect(screen.getByRole('checkbox', { name: rowElementMock1.label })).toBeInTheDocument();
+    expect(screen.getByText(rowElementMock1.label)).toBeInTheDocument();
+    expect(screen.getByText(rowElementMock1.description)).toBeInTheDocument();
+  });
+
+  it('should render the checkbox as checked when "checked" is true', () => {
+    renderStudioCheckboxTableRow({
+      rowElement: { ...rowElementMock1, checked: true },
+    });
+
+    const checkbox = screen.getByRole('checkbox', { name: rowElementMock1.label });
+    expect(checkbox).toBeChecked();
+  });
+
+  it('should render the checkbox as not checked when "checked" is false', () => {
+    renderStudioCheckboxTableRow({
+      rowElement: { ...rowElementMock1, checked: false },
+    });
+
+    const checkbox = screen.getByRole('checkbox', { name: rowElementMock1.label });
+    expect(checkbox).not.toBeChecked();
+  });
+
+  it('should call onChange when the checkbox is clicked', async () => {
+    const user = userEvent.setup();
+    const mockOnChange = jest.fn();
+
+    renderStudioCheckboxTableRow({
+      rowElement: { ...rowElementMock1, checked: false },
+      onChange: mockOnChange,
+    });
+
+    const checkbox = screen.getByRole('checkbox', { name: rowElementMock1.label });
+    expect(checkbox).not.toBeChecked();
+    await user.click(checkbox);
+
+    expect(mockOnChange).toHaveBeenCalledTimes(1);
+  });
+
+  it('should render the description when it is provided', () => {
+    renderStudioCheckboxTableRow();
+    expect(screen.getByText(rowElementMock1.description)).toBeInTheDocument();
+  });
+
+  it('should not render the description when it is not provided', () => {
+    const rowElementWithoutDescription = {
+      ...rowElementMock1,
+      description: undefined,
+    };
+
+    renderStudioCheckboxTableRow({
+      rowElement: rowElementWithoutDescription,
+    });
+
+    expect(screen.queryByText(rowElementMock1.description)).not.toBeInTheDocument();
+  });
+});
+
+const defaultProps: StudioCheckboxTableRowProps = {
+  rowElement: rowElementMock1,
+  onChange: jest.fn(),
+};
+
+const renderStudioCheckboxTableRow = (props: Partial<StudioCheckboxTableRowProps> = {}) => {
+  render(
+    <table>
+      <tbody>
+        <StudioCheckboxTableRow {...defaultProps} {...props} />
+      </tbody>
+    </table>,
+  );
+};
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/StudioCheckboxTableRow.tsx b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/StudioCheckboxTableRow.tsx
new file mode 100644
index 00000000000..4081a658947
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/StudioCheckboxTableRow.tsx
@@ -0,0 +1,40 @@
+import React, { type ReactElement, type ChangeEvent } from 'react';
+import classes from './StudioCheckboxTableRow.module.css';
+import { type StudioCheckboxTableRowElement } from '../types/StudioCheckboxTableRowElement';
+import { StudioTable } from '../../StudioTable';
+import { StudioCheckbox } from '../../StudioCheckbox';
+import { StudioParagraph } from '../../StudioParagraph';
+
+export type StudioCheckboxTableRowProps = {
+  rowElement: StudioCheckboxTableRowElement;
+  onChange: (event: ChangeEvent<HTMLInputElement>) => void;
+};
+
+export const StudioCheckboxTableRow = ({
+  rowElement,
+  onChange,
+}: StudioCheckboxTableRowProps): ReactElement => {
+  const { value, label, description, checked } = rowElement;
+  return (
+    <StudioTable.Row>
+      <StudioTable.Cell className={classes.checkboxCell}>
+        <StudioCheckbox
+          aria-label={label}
+          onChange={onChange}
+          size='sm'
+          value={value}
+          description={description}
+          checked={checked}
+        />
+      </StudioTable.Cell>
+      <StudioTable.Cell className={classes.chexboxTextContent}>
+        <StudioParagraph size='sm'>{label}</StudioParagraph>
+        {description && (
+          <StudioParagraph size='sm' className={classes.descriptionText}>
+            {description}
+          </StudioParagraph>
+        )}
+      </StudioTable.Cell>
+    </StudioTable.Row>
+  );
+};
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/index.ts b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/index.ts
new file mode 100644
index 00000000000..cecb99e716f
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/StudioCheckboxTableRow/index.ts
@@ -0,0 +1 @@
+export { StudioCheckboxTableRow } from './StudioCheckboxTableRow';
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/index.ts b/frontend/libs/studio-components/src/components/StudioCheckboxTable/index.ts
new file mode 100644
index 00000000000..2ca57b5ac8e
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/index.ts
@@ -0,0 +1,21 @@
+import {
+  StudioCheckboxTable as StudioCheckboxTableParent,
+  type StudioCheckboxTableProps,
+} from './StudioCheckboxTable';
+import { StudioCheckboxTableBody } from './StudioCheckboxTableBody';
+import { StudioCheckboxTableHeader } from './StudioCheckboxTableHeader';
+import { StudioCheckboxTableRow } from './StudioCheckboxTableRow';
+
+type StudioCheckboxTableComponent = typeof StudioCheckboxTableParent & {
+  Header: typeof StudioCheckboxTableHeader;
+  Body: typeof StudioCheckboxTableBody;
+  Row: typeof StudioCheckboxTableRow;
+};
+
+const StudioCheckboxTable = StudioCheckboxTableParent as StudioCheckboxTableComponent;
+
+StudioCheckboxTable.Header = StudioCheckboxTableHeader;
+StudioCheckboxTable.Body = StudioCheckboxTableBody;
+StudioCheckboxTable.Row = StudioCheckboxTableRow;
+
+export { StudioCheckboxTable, type StudioCheckboxTableProps };
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/mocks/index.ts b/frontend/libs/studio-components/src/components/StudioCheckboxTable/mocks/index.ts
new file mode 100644
index 00000000000..561d8397253
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/mocks/index.ts
@@ -0,0 +1,17 @@
+import { type StudioCheckboxTableRowElement } from '../types/StudioCheckboxTableRowElement';
+
+export const rowElementMock1: StudioCheckboxTableRowElement = {
+  value: 'test-value 1',
+  label: 'Test Label 1',
+  description: 'Test Description 1',
+  checked: false,
+};
+
+export const rowElementMock2: StudioCheckboxTableRowElement = {
+  value: 'test-value 2',
+  label: 'Test Label 2',
+  description: 'Test Description 2',
+  checked: true,
+};
+
+export const rowElementMocks: StudioCheckboxTableRowElement[] = [rowElementMock1, rowElementMock2];
diff --git a/frontend/libs/studio-components/src/components/StudioCheckboxTable/types/StudioCheckboxTableRowElement.ts b/frontend/libs/studio-components/src/components/StudioCheckboxTable/types/StudioCheckboxTableRowElement.ts
new file mode 100644
index 00000000000..c2b4b447f9a
--- /dev/null
+++ b/frontend/libs/studio-components/src/components/StudioCheckboxTable/types/StudioCheckboxTableRowElement.ts
@@ -0,0 +1,6 @@
+export type StudioCheckboxTableRowElement = {
+  value: string;
+  label: string;
+  description?: string;
+  checked: boolean;
+};
diff --git a/frontend/libs/studio-components/src/components/StudioCodelistEditor/StudioCodeListEditor.test.tsx b/frontend/libs/studio-components/src/components/StudioCodelistEditor/StudioCodeListEditor.test.tsx
index 509846eb4e1..4aa68ee00aa 100644
--- a/frontend/libs/studio-components/src/components/StudioCodelistEditor/StudioCodeListEditor.test.tsx
+++ b/frontend/libs/studio-components/src/components/StudioCodelistEditor/StudioCodeListEditor.test.tsx
@@ -47,10 +47,12 @@ const codeList: CodeList = [
   },
 ];
 const onChange = jest.fn();
+const onInvalid = jest.fn();
 const defaultProps: StudioCodeListEditorProps = {
   codeList,
   texts,
   onChange,
+  onInvalid,
 };
 const duplicatedValue = 'duplicate';
 const codeListWithDuplicatedValues: CodeList = [
@@ -254,6 +256,23 @@ describe('StudioCodeListEditor', () => {
     await user.type(validValueInput, 'new value');
     expect(onChange).not.toHaveBeenCalled();
   });
+
+  it('Does trigger onInvalid if the code list is invalid', async () => {
+    const user = userEvent.setup();
+    renderCodeListEditor({ codeList: codeListWithDuplicatedValues });
+    const validValueInput = screen.getByRole('textbox', { name: texts.itemValue(3) });
+    const newValue = 'new value';
+    await user.type(validValueInput, newValue);
+    expect(onInvalid).toHaveBeenCalledTimes(newValue.length);
+  });
+
+  it('Does not trigger onInvalid if an invalid code list is changed to a valid state', async () => {
+    const user = userEvent.setup();
+    renderCodeListEditor({ codeList: codeListWithDuplicatedValues });
+    const invalidValueInput = screen.getByRole('textbox', { name: texts.itemValue(2) });
+    await user.type(invalidValueInput, 'new unique value');
+    expect(onInvalid).not.toHaveBeenCalled();
+  });
 });
 
 function renderCodeListEditor(props: Partial<StudioCodeListEditorProps> = {}) {
diff --git a/frontend/libs/studio-components/src/components/StudioCodelistEditor/StudioCodeListEditor.tsx b/frontend/libs/studio-components/src/components/StudioCodelistEditor/StudioCodeListEditor.tsx
index 231ed3116a1..13a5906ace1 100644
--- a/frontend/libs/studio-components/src/components/StudioCodelistEditor/StudioCodeListEditor.tsx
+++ b/frontend/libs/studio-components/src/components/StudioCodelistEditor/StudioCodeListEditor.tsx
@@ -27,27 +27,30 @@ import { StudioErrorMessage } from '../StudioErrorMessage';
 export type StudioCodeListEditorProps = {
   codeList: CodeList;
   onChange: (codeList: CodeList) => void;
+  onInvalid?: () => void;
   texts: CodeListEditorTexts;
 };
 
 export function StudioCodeListEditor({
   codeList,
   onChange,
+  onInvalid,
   texts,
 }: StudioCodeListEditorProps): ReactElement {
   return (
     <StudioCodeListEditorContext.Provider value={{ texts }}>
-      <StatefulCodeListEditor codeList={codeList} onChange={onChange} />
+      <StatefulCodeListEditor codeList={codeList} onChange={onChange} onInvalid={onInvalid} />
     </StudioCodeListEditorContext.Provider>
   );
 }
 
-type InternalCodeListEditorProps = Omit<StudioCodeListEditorProps, 'texts'>;
+type StatefulCodeListEditorProps = Omit<StudioCodeListEditorProps, 'texts'>;
 
 function StatefulCodeListEditor({
   codeList: defaultCodeList,
   onChange,
-}: InternalCodeListEditorProps): ReactElement {
+  onInvalid,
+}: StatefulCodeListEditorProps): ReactElement {
   const [codeList, setCodeList] = useState<CodeList>(defaultCodeList);
 
   useEffect(() => {
@@ -58,13 +61,16 @@ function StatefulCodeListEditor({
     (newCodeList: CodeList) => {
       setCodeList(newCodeList);
       if (isCodeListValid(newCodeList)) onChange(newCodeList);
+      else onInvalid();
     },
-    [onChange],
+    [onChange, onInvalid],
   );
 
   return <ControlledCodeListEditor codeList={codeList} onChange={handleChange} />;
 }
 
+type InternalCodeListEditorProps = Omit<StatefulCodeListEditorProps, 'onInvalid'>;
+
 function ControlledCodeListEditor({
   codeList,
   onChange,
diff --git a/frontend/libs/studio-components/src/components/StudioInputTable/Cell/BaseInputCell.ts b/frontend/libs/studio-components/src/components/StudioInputTable/Cell/BaseInputCell.ts
index a8d1e768c39..7f5707e6159 100644
--- a/frontend/libs/studio-components/src/components/StudioInputTable/Cell/BaseInputCell.ts
+++ b/frontend/libs/studio-components/src/components/StudioInputTable/Cell/BaseInputCell.ts
@@ -6,7 +6,6 @@ import { getNextInputElement } from '../dom-utils/getNextInputElement';
 
 type DefaultProps<Element extends HTMLCellInputElement> = {
   onKeyDown?: (event: KeyboardEvent<Element>) => void;
-  tabIndex?: number;
 };
 
 export abstract class BaseInputCell<
@@ -37,7 +36,6 @@ export abstract class BaseInputCell<
 
   private defaultProps: Required<DefaultProps<Element>> = {
     onKeyDown: (event) => this.handleKeyDown(event),
-    tabIndex: -1,
   };
 
   private handleKeyDown(event: KeyboardEvent<Element>): void {
@@ -74,9 +72,7 @@ export abstract class BaseInputCell<
     const nextElement = this.getNextElement(event);
     if (nextElement) {
       event.preventDefault();
-      nextElement.tabIndex = 0;
       nextElement.focus();
-      event.currentTarget.tabIndex = -1;
     }
   }
 
diff --git a/frontend/libs/studio-components/src/components/StudioInputTable/HeaderCell/HeaderCellCheckbox.tsx b/frontend/libs/studio-components/src/components/StudioInputTable/HeaderCell/HeaderCellCheckbox.tsx
index 25bb2e8ba78..8b7bc251626 100644
--- a/frontend/libs/studio-components/src/components/StudioInputTable/HeaderCell/HeaderCellCheckbox.tsx
+++ b/frontend/libs/studio-components/src/components/StudioInputTable/HeaderCell/HeaderCellCheckbox.tsx
@@ -13,14 +13,7 @@ export const HeaderCellCheckbox = forwardRef<HTMLInputElement, HeaderCellCheckbo
     const value = givenValue ?? defaultValue;
     return (
       <StudioTable.HeaderCell className={className}>
-        <StudioCheckbox
-          onKeyDown={handleKeyDown}
-          ref={ref}
-          size='small'
-          tabIndex={-1}
-          value={value}
-          {...rest}
-        />
+        <StudioCheckbox onKeyDown={handleKeyDown} ref={ref} size='small' value={value} {...rest} />
       </StudioTable.HeaderCell>
     );
   },
@@ -36,9 +29,7 @@ function moveFocus(event: React.KeyboardEvent<HTMLCellInputElement>) {
   const nextElement = getNextElement(event);
   if (nextElement) {
     event.preventDefault();
-    nextElement.tabIndex = 0;
     nextElement.focus();
-    event.currentTarget.tabIndex = -1;
   }
 }
 
diff --git a/frontend/libs/studio-components/src/components/StudioInputTable/StudioInputTable.test.tsx b/frontend/libs/studio-components/src/components/StudioInputTable/StudioInputTable.test.tsx
index 06c4c848bbd..a6c99c36970 100644
--- a/frontend/libs/studio-components/src/components/StudioInputTable/StudioInputTable.test.tsx
+++ b/frontend/libs/studio-components/src/components/StudioInputTable/StudioInputTable.test.tsx
@@ -92,14 +92,6 @@ describe('StudioInputTable', () => {
     expect(firstInput).toHaveFocus();
   });
 
-  it('Moves focus out of the table when the user first tabs into it and then tabs again', async () => {
-    const user = userEvent.setup();
-    render(<TestTable />);
-    await user.tab();
-    await user.tab();
-    expect(document.body).toHaveFocus();
-  });
-
   it('Lets the user focus on the input elements using the arrow and enter keys', async () => {
     const user = userEvent.setup();
     render(<TestTable />);
diff --git a/frontend/libs/studio-components/src/components/StudioInputTable/StudioInputTable.tsx b/frontend/libs/studio-components/src/components/StudioInputTable/StudioInputTable.tsx
index 66bfff53fb0..ba4384e4bf9 100644
--- a/frontend/libs/studio-components/src/components/StudioInputTable/StudioInputTable.tsx
+++ b/frontend/libs/studio-components/src/components/StudioInputTable/StudioInputTable.tsx
@@ -4,7 +4,6 @@ import { StudioTable } from '../StudioTable';
 import classes from './StudioInputTable.module.css';
 import cn from 'classnames';
 import { useForwardedRef } from '@studio/hooks';
-import { activateTabbingOnFirstInputElement } from './dom-utils/activateTabbingOnFirstInputElement';
 import type { StudioInputTableContextValue } from './StudioInputTableContext';
 import { StudioInputTableContext } from './StudioInputTableContext';
 
@@ -16,7 +15,6 @@ export const StudioInputTable = forwardRef<HTMLTableElement, StudioInputTablePro
     const forwardedRef = useForwardedRef<HTMLTableElement>(ref);
     const internalRef = useCallback(
       (table: HTMLTableElement) => {
-        activateTabbingOnFirstInputElement(table);
         forwardedRef.current = table;
       },
       [forwardedRef],
diff --git a/frontend/libs/studio-components/src/components/StudioInputTable/dom-utils/activateTabbingOnFirstInputElement.ts b/frontend/libs/studio-components/src/components/StudioInputTable/dom-utils/activateTabbingOnFirstInputElement.ts
deleted file mode 100644
index 66c7190d938..00000000000
--- a/frontend/libs/studio-components/src/components/StudioInputTable/dom-utils/activateTabbingOnFirstInputElement.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { HTMLCellInputElement } from '../types/HTMLCellInputElement';
-
-export function activateTabbingOnFirstInputElement(table: HTMLTableElement) {
-  getFirstInputElement(table)?.setAttribute('tabindex', '0');
-}
-
-function getFirstInputElement(table: HTMLTableElement): HTMLCellInputElement | null {
-  return table?.querySelector('input, textarea, button');
-}
diff --git a/frontend/libs/studio-components/src/components/index.ts b/frontend/libs/studio-components/src/components/index.ts
index 092dff86449..292f091f9df 100644
--- a/frontend/libs/studio-components/src/components/index.ts
+++ b/frontend/libs/studio-components/src/components/index.ts
@@ -10,6 +10,7 @@ export * from './StudioButton';
 export * from './StudioCard';
 export * from './StudioCenter';
 export * from './StudioCheckbox';
+export * from './StudioCheckboxTable';
 export * from './StudioCodeFragment';
 export * from './StudioCodelistEditor';
 export * from './StudioCombobox';
diff --git a/frontend/libs/studio-icons/src/react/icons/ContactResourceIcon.tsx b/frontend/libs/studio-icons/src/react/icons/ContactResourceIcon.tsx
new file mode 100644
index 00000000000..27e66572790
--- /dev/null
+++ b/frontend/libs/studio-icons/src/react/icons/ContactResourceIcon.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import type { IconProps } from '../types';
+import { SvgTemplate } from './SvgTemplate';
+
+export const ContactResourceIcon = (props: IconProps): React.ReactElement => {
+  return (
+    <SvgTemplate viewBox='0 0 60 60' {...props}>
+      <circle cx='30' cy='30' r='30' fill='#022F51' />
+      <path
+        d='M21.303 33.9574C21.303 35.6919 19.886 37.1089 18.1515 37.1089C16.4169 37.1089 15 35.6919 15 33.9574C15 32.2229 16.4169 30.8059 18.1515 30.8059H21.303V33.9574Z'
+        fill='#E01E5A'
+      />
+      <path
+        d='M22.8909 33.9574C22.8909 32.2229 24.3078 30.8059 26.0424 30.8059C27.7769 30.8059 29.1938 32.2229 29.1938 33.9574V41.8483C29.1938 43.5829 27.7769 44.9998 26.0424 44.9998C24.3078 44.9998 22.8909 43.5829 22.8909 41.8483V33.9574Z'
+        fill='#E01E5A'
+      />
+      <path
+        d='M26.0424 21.303C24.3078 21.303 22.8909 19.886 22.8909 18.1515C22.8909 16.4169 24.3078 15 26.0424 15C27.7769 15 29.1938 16.4169 29.1938 18.1515V21.303H26.0424Z'
+        fill='#36C5F0'
+      />
+      <path
+        d='M26.0424 22.8906C27.777 22.8906 29.1939 24.3076 29.1939 26.0421C29.1939 27.7767 27.777 29.1936 26.0424 29.1936H18.1515C16.4169 29.1936 15 27.7767 15 26.0421C15 24.3076 16.4169 22.8906 18.1515 22.8906H26.0424Z'
+        fill='#36C5F0'
+      />
+      <path
+        d='M38.6973 26.0421C38.6973 24.3076 40.1142 22.8906 41.8488 22.8906C43.5833 22.8906 45.0002 24.3076 45.0002 26.0421C45.0002 27.7767 43.5833 29.1936 41.8488 29.1936H38.6973V26.0421Z'
+        fill='#2EB67D'
+      />
+      <path
+        d='M37.1094 26.0424C37.1094 27.777 35.6924 29.1939 33.9579 29.1939C32.2233 29.1939 30.8064 27.777 30.8064 26.0424V18.1515C30.8064 16.4169 32.2233 15 33.9579 15C35.6924 15 37.1094 16.4169 37.1094 18.1515V26.0424Z'
+        fill='#2EB67D'
+      />
+      <path
+        d='M33.9579 38.6973C35.6924 38.6973 37.1094 40.1142 37.1094 41.8488C37.1094 43.5833 35.6924 45.0002 33.9579 45.0002C32.2233 45.0002 30.8064 43.5833 30.8064 41.8488V38.6973H33.9579Z'
+        fill='#ECB22E'
+      />
+      <path
+        d='M33.9579 37.1094C32.2233 37.1094 30.8064 35.6924 30.8064 33.9579C30.8064 32.2233 32.2233 30.8064 33.9579 30.8064H41.8488C43.5834 30.8064 45.0003 32.2233 45.0003 33.9579C45.0003 35.6924 43.5834 37.1094 41.8488 37.1094H33.9579Z'
+        fill='#ECB22E'
+      />
+    </SvgTemplate>
+  );
+};
diff --git a/frontend/libs/studio-icons/src/react/icons/DesignResourceIcon.tsx b/frontend/libs/studio-icons/src/react/icons/DesignResourceIcon.tsx
new file mode 100644
index 00000000000..a66fead81a5
--- /dev/null
+++ b/frontend/libs/studio-icons/src/react/icons/DesignResourceIcon.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import type { IconProps } from '../types';
+import { SvgTemplate } from './SvgTemplate';
+
+export const DesignResourceIcon = (props: IconProps): React.ReactElement => {
+  return (
+    <SvgTemplate viewBox='0 0 60 60' {...props}>
+      <circle cx='30' cy='30' r='30' fill='#022F51' />
+      <path
+        d='M18.294 36V26.874H16.458V36H18.294ZM18.348 25.074V23.13H16.404V25.074H18.348ZM29.2141 36L25.6501 30.456L28.8181 26.874H26.5861L23.0401 31.086V23.184H21.2041V36H23.0401V33.318L24.3901 31.788L26.9461 36H29.2141ZM37.5267 31.428C37.5267 29.898 37.3107 28.746 36.4467 27.846C35.8527 27.234 34.9527 26.766 33.7107 26.766C32.4687 26.766 31.5867 27.234 30.9927 27.846C30.1287 28.746 29.9127 29.898 29.9127 31.428C29.9127 32.976 30.1287 34.128 30.9927 35.028C31.5867 35.64 32.4687 36.108 33.7107 36.108C34.9527 36.108 35.8527 35.64 36.4467 35.028C37.3107 34.128 37.5267 32.976 37.5267 31.428ZM35.6907 31.428C35.6907 32.418 35.6187 33.372 35.0607 33.93C34.7187 34.272 34.2507 34.47 33.7107 34.47C33.1707 34.47 32.7207 34.272 32.3787 33.93C31.8207 33.372 31.7487 32.418 31.7487 31.428C31.7487 30.438 31.8207 29.484 32.3787 28.926C32.7207 28.584 33.1707 28.404 33.7107 28.404C34.2507 28.404 34.7187 28.584 35.0607 28.926C35.6187 29.484 35.6907 30.438 35.6907 31.428ZM47.4107 36V30.168C47.4107 29.142 47.1947 28.278 46.4927 27.594C45.9527 27.072 45.1787 26.766 44.2427 26.766C43.3247 26.766 42.4427 27.108 41.8127 27.792V26.874H40.0127V36H41.8487V30.438C41.8487 29.034 42.7127 28.404 43.7387 28.404C44.7647 28.404 45.5747 29.016 45.5747 30.438V36H47.4107Z'
+        fill='#022F51'
+      />
+      <path
+        d='M24.9333 45.0001C27.6564 45.0001 29.8665 42.7601 29.8665 40V35H24.9333C22.2101 35 20 37.24 20 40C20 42.7601 22.2101 45.0001 24.9333 45.0001Z'
+        fill='#0ACF83'
+      />
+      <path
+        d='M20 30C20 27.24 22.2101 25 24.9333 25H29.8665V35.0001H24.9333C22.2101 35.0001 20 32.7601 20 30Z'
+        fill='#A259FF'
+      />
+      <path
+        d='M20 20C20 17.24 22.2101 15 24.9333 15H29.8665V25.0001H24.9333C22.2101 25.0001 20 22.7601 20 20Z'
+        fill='#F24E1E'
+      />
+      <path
+        d='M29.8667 15H34.8C37.5231 15 39.7332 17.24 39.7332 20C39.7332 22.7601 37.5231 25.0001 34.8 25.0001H29.8667V15Z'
+        fill='#FF7262'
+      />
+      <path
+        d='M39.7332 30C39.7332 32.7601 37.5231 35.0001 34.8 35.0001C32.0768 35.0001 29.8667 32.7601 29.8667 30C29.8667 27.24 32.0768 25 34.8 25C37.5231 25 39.7332 27.24 39.7332 30Z'
+        fill='#1ABCFE'
+      />
+    </SvgTemplate>
+  );
+};
diff --git a/frontend/libs/studio-icons/src/react/icons/DocsResourceIcon.tsx b/frontend/libs/studio-icons/src/react/icons/DocsResourceIcon.tsx
new file mode 100644
index 00000000000..7c1f2b8370e
--- /dev/null
+++ b/frontend/libs/studio-icons/src/react/icons/DocsResourceIcon.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import type { IconProps } from '../types';
+import { SvgTemplate } from './SvgTemplate';
+
+export const DocsResourceIcon = (props: IconProps): React.ReactElement => {
+  return (
+    <SvgTemplate viewBox='0 0 60 60' {...props}>
+      <circle cx='30' cy='30' r='30' fill='#022F51' />
+      <path
+        d='M41 44H20V16H41V44ZM21.2353 42.7826H39.7647V17.2174H21.2353V42.7826Z'
+        fill='#FFFEFE'
+      />
+      <path
+        d='M24.9412 26.9565H36.0588V28.1739H24.9412V26.9565ZM24.9412 22.0869H31.1176V23.3043H24.9412V22.0869ZM24.9412 31.8261H36.0588V33.0435H24.9412V31.8261ZM24.9412 36.6956H36.0588V37.913H24.9412V36.6956Z'
+        fill='#FFFEFE'
+      />
+    </SvgTemplate>
+  );
+};
diff --git a/frontend/libs/studio-icons/src/react/icons/OperationStatusResourceIcon.tsx b/frontend/libs/studio-icons/src/react/icons/OperationStatusResourceIcon.tsx
new file mode 100644
index 00000000000..258f2d62d27
--- /dev/null
+++ b/frontend/libs/studio-icons/src/react/icons/OperationStatusResourceIcon.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import type { IconProps } from '../types';
+import { SvgTemplate } from './SvgTemplate';
+
+export const OperationStatusResourceIcon = (props: IconProps): React.ReactElement => {
+  return (
+    <SvgTemplate viewBox='0 0 60 60' {...props}>
+      <ellipse cx='30' cy='29.7794' rx='30' ry='29.7794' fill='#022F51' />
+      <path
+        d='M18.294 35.875V26.749H16.458V35.875H18.294ZM18.348 24.949V23.005H16.404V24.949H18.348ZM29.2141 35.875L25.6501 30.331L28.8181 26.749H26.5861L23.0401 30.961V23.059H21.2041V35.875H23.0401V33.193L24.3901 31.663L26.9461 35.875H29.2141ZM37.5267 31.303C37.5267 29.773 37.3107 28.621 36.4467 27.721C35.8527 27.109 34.9527 26.641 33.7107 26.641C32.4687 26.641 31.5867 27.109 30.9927 27.721C30.1287 28.621 29.9127 29.773 29.9127 31.303C29.9127 32.851 30.1287 34.003 30.9927 34.903C31.5867 35.515 32.4687 35.983 33.7107 35.983C34.9527 35.983 35.8527 35.515 36.4467 34.903C37.3107 34.003 37.5267 32.851 37.5267 31.303ZM35.6907 31.303C35.6907 32.293 35.6187 33.247 35.0607 33.805C34.7187 34.147 34.2507 34.345 33.7107 34.345C33.1707 34.345 32.7207 34.147 32.3787 33.805C31.8207 33.247 31.7487 32.293 31.7487 31.303C31.7487 30.313 31.8207 29.359 32.3787 28.801C32.7207 28.459 33.1707 28.279 33.7107 28.279C34.2507 28.279 34.7187 28.459 35.0607 28.801C35.6187 29.359 35.6907 30.313 35.6907 31.303ZM47.4107 35.875V30.043C47.4107 29.017 47.1947 28.153 46.4927 27.469C45.9527 26.947 45.1787 26.641 44.2427 26.641C43.3247 26.641 42.4427 26.983 41.8127 27.667V26.749H40.0127V35.875H41.8487V30.313C41.8487 28.909 42.7127 28.279 43.7387 28.279C44.7647 28.279 45.5747 28.891 45.5747 30.313V35.875H47.4107Z'
+        fill='#022F51'
+      />
+      <path
+        d='M28.3501 36.7166C30.9167 35.7833 33.6001 34.2666 35.8167 31.9333C40.1334 27.6166 42.0001 22.1333 41.1834 17.6999C36.7501 16.8833 31.2667 18.7499 26.9501 23.0666C24.6167 25.3999 23.1001 27.9666 22.1667 30.5333L28.3501 36.7166Z'
+        stroke='white'
+        strokeMiterlimit='10'
+      />
+      <path d='M18.9 33.8L15.6333 37.1834' stroke='white' strokeMiterlimit='10' />
+      <path d='M22.1668 37.1833L17.2668 42.0834' stroke='white' strokeMiterlimit='10' />
+      <path d='M25.4334 40.45L22.1667 43.7166' stroke='white' strokeMiterlimit='10' />
+      <path
+        d='M28.0002 22.1332C24.8502 21.8999 21.5835 22.9499 19.0168 25.1666L22.7502 28.8999'
+        stroke='white'
+        strokeMiterlimit='10'
+      />
+      <path
+        d='M29.9835 36.25L33.7169 39.9833C35.9335 37.4166 36.9835 34.15 36.7502 30.8833'
+        stroke='white'
+        strokeMiterlimit='10'
+      />
+      <path d='M30.4501 20.3833L38.5001 28.4333' stroke='white' strokeMiterlimit='10' />
+    </SvgTemplate>
+  );
+};
diff --git a/frontend/libs/studio-icons/src/react/icons/OrgResourceIcon.tsx b/frontend/libs/studio-icons/src/react/icons/OrgResourceIcon.tsx
new file mode 100644
index 00000000000..97f60785490
--- /dev/null
+++ b/frontend/libs/studio-icons/src/react/icons/OrgResourceIcon.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import type { IconProps } from '../types';
+import { SvgTemplate } from './SvgTemplate';
+
+export const OrgResourceIcon = (props: IconProps): React.ReactElement => {
+  return (
+    <SvgTemplate viewBox='0 0 60 60' {...props}>
+      <ellipse cx='30' cy='29.7794' rx='30' ry='29.7794' fill='#022F51' />
+      <path
+        d='M18.294 35.875V26.749H16.458V35.875H18.294ZM18.348 24.949V23.005H16.404V24.949H18.348ZM29.2141 35.875L25.6501 30.331L28.8181 26.749H26.5861L23.0401 30.961V23.059H21.2041V35.875H23.0401V33.193L24.3901 31.663L26.9461 35.875H29.2141ZM37.5267 31.303C37.5267 29.773 37.3107 28.621 36.4467 27.721C35.8527 27.109 34.9527 26.641 33.7107 26.641C32.4687 26.641 31.5867 27.109 30.9927 27.721C30.1287 28.621 29.9127 29.773 29.9127 31.303C29.9127 32.851 30.1287 34.003 30.9927 34.903C31.5867 35.515 32.4687 35.983 33.7107 35.983C34.9527 35.983 35.8527 35.515 36.4467 34.903C37.3107 34.003 37.5267 32.851 37.5267 31.303ZM35.6907 31.303C35.6907 32.293 35.6187 33.247 35.0607 33.805C34.7187 34.147 34.2507 34.345 33.7107 34.345C33.1707 34.345 32.7207 34.147 32.3787 33.805C31.8207 33.247 31.7487 32.293 31.7487 31.303C31.7487 30.313 31.8207 29.359 32.3787 28.801C32.7207 28.459 33.1707 28.279 33.7107 28.279C34.2507 28.279 34.7187 28.459 35.0607 28.801C35.6187 29.359 35.6907 30.313 35.6907 31.303ZM47.4107 35.875V30.043C47.4107 29.017 47.1947 28.153 46.4927 27.469C45.9527 26.947 45.1787 26.641 44.2427 26.641C43.3247 26.641 42.4427 26.983 41.8127 27.667V26.749H40.0127V35.875H41.8487V30.313C41.8487 28.909 42.7127 28.279 43.7387 28.279C44.7647 28.279 45.5747 28.891 45.5747 30.313V35.875H47.4107Z'
+        fill='#022F51'
+      />
+      <path
+        d='M44 42H42.7273V15.2727H28.7273V42H27.4545V25.4545H17.2727V42H16V24.1818H27.4545V14H44V42Z'
+        fill='#FFFEFE'
+      />
+      <path
+        d='M37.6364 19.0909H38.9091V42H37.6364V19.0909ZM32.5455 19.0909H33.8182V42H32.5455V19.0909ZM21.0909 30.5454H24.9091V31.8182H21.0909V30.5454ZM21.0909 35.6363H24.9091V36.9091H21.0909V35.6363ZM21.0909 40.7272H24.9091V42H21.0909V40.7272Z'
+        fill='#FFFEFE'
+      />
+    </SvgTemplate>
+  );
+};
diff --git a/frontend/libs/studio-icons/src/react/icons/RoadmapResourceIcon.tsx b/frontend/libs/studio-icons/src/react/icons/RoadmapResourceIcon.tsx
new file mode 100644
index 00000000000..ddb3a30aa23
--- /dev/null
+++ b/frontend/libs/studio-icons/src/react/icons/RoadmapResourceIcon.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import type { IconProps } from '../types';
+import { SvgTemplate } from './SvgTemplate';
+
+export const RoadmapResourceIcon = (props: IconProps): React.ReactElement => {
+  return (
+    <SvgTemplate viewBox='0 0 60 60' {...props}>
+      <circle cx='30' cy='30' r='30' fill='#022F51' />
+      <path
+        d='M24.9692 31.011H26.2V44.5588H24.9692V31.011ZM24.9692 15H26.2V19.9265H24.9692V15ZM39.2462 31.011H15V21.1581H39.1231L47 26.0845L39.2462 31.011V31.011ZM16.2308 29.7794H38.8769L44.6615 26.0845L38.7538 22.3897H16.2308V29.7794Z'
+        fill='white'
+      />
+    </SvgTemplate>
+  );
+};
diff --git a/frontend/libs/studio-icons/src/react/icons/SlackIcon.tsx b/frontend/libs/studio-icons/src/react/icons/SlackIcon.tsx
index c7e3238c3b2..384b9a554eb 100644
--- a/frontend/libs/studio-icons/src/react/icons/SlackIcon.tsx
+++ b/frontend/libs/studio-icons/src/react/icons/SlackIcon.tsx
@@ -40,33 +40,3 @@ export const SlackIcon = (props: IconProps): React.ReactElement => {
     </SvgTemplate>
   );
 };
-
-/*
-<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path
-    d="M6.72317 21.0286C6.72317 22.8788 5.21176 24.3902 3.36159 24.3902C1.51141 24.3902 0 22.8788 0 21.0286C0 19.1784 1.51141 17.667 3.36159 17.667H6.72317V21.0286Z"
-    fill="#E01E5A" />
-  <path
-    d="M8.41797 21.0286C8.41797 19.1784 9.92938 17.667 11.7796 17.667C13.6297 17.667 15.1411 19.1784 15.1411 21.0286V29.4456C15.1411 31.2957 13.6297 32.8072 11.7796 32.8072C9.92938 32.8072 8.41797 31.2957 8.41797 29.4456V21.0286Z"
-    fill="#E01E5A" />
-  <path
-    d="M11.7796 7.53079C9.92938 7.53079 8.41797 6.01938 8.41797 4.1692C8.41797 2.31903 9.92938 0.807617 11.7796 0.807617C13.6297 0.807617 15.1411 2.31903 15.1411 4.1692V7.53079H11.7796Z"
-    fill="#36C5F0" />
-  <path
-    d="M11.7786 9.22363C13.6288 9.22363 15.1402 10.735 15.1402 12.5852C15.1402 14.4354 13.6288 15.9468 11.7786 15.9468H3.36159C1.51141 15.9468 0 14.4354 0 12.5852C0 10.735 1.51141 9.22363 3.36159 9.22363H11.7786Z"
-    fill="#36C5F0" />
-  <path
-    d="M25.2773 12.5852C25.2773 10.735 26.7888 9.22363 28.6389 9.22363C30.4891 9.22363 32.0005 10.735 32.0005 12.5852C32.0005 14.4354 30.4891 15.9468 28.6389 15.9468H25.2773V12.5852Z"
-    fill="#2EB67D" />
-  <path
-    d="M23.5825 12.5862C23.5825 14.4364 22.0711 15.9478 20.221 15.9478C18.3708 15.9478 16.8594 14.4364 16.8594 12.5862V4.1692C16.8594 2.31903 18.3708 0.807617 20.221 0.807617C22.0711 0.807617 23.5825 2.31903 23.5825 4.1692V12.5862Z"
-    fill="#2EB67D" />
-  <path
-    d="M20.221 26.085C22.0711 26.085 23.5825 27.5964 23.5825 29.4465C23.5825 31.2967 22.0711 32.8081 20.221 32.8081C18.3708 32.8081 16.8594 31.2967 16.8594 29.4465V26.085H20.221Z"
-    fill="#ECB22E" />
-  <path
-    d="M20.221 24.3911C18.3708 24.3911 16.8594 22.8797 16.8594 21.0296C16.8594 19.1794 18.3708 17.668 20.221 17.668H28.638C30.4881 17.668 31.9995 19.1794 31.9995 21.0296C31.9995 22.8797 30.4881 24.3911 28.638 24.3911H20.221Z"
-    fill="#ECB22E" />
-</svg>
-
-*/
diff --git a/frontend/libs/studio-icons/src/react/icons/index.ts b/frontend/libs/studio-icons/src/react/icons/index.ts
index 76234f2d6bb..80042250b29 100644
--- a/frontend/libs/studio-icons/src/react/icons/index.ts
+++ b/frontend/libs/studio-icons/src/react/icons/index.ts
@@ -5,8 +5,11 @@ export { CheckboxIcon } from './CheckboxIcon';
 export { CodeListsIcon } from './CodeListsIcon';
 export { CombinationIcon } from './CombinationIcon';
 export { ConfirmationTaskIcon } from './ConfirmationTaskIcon';
+export { ContactResourceIcon } from './ContactResourceIcon';
 export { DataTaskIcon } from './DataTaskIcon';
 export { DefinitionIcon } from './DefinitionIcon';
+export { DesignResourceIcon } from './DesignResourceIcon';
+export { DocsResourceIcon } from './DocsResourceIcon';
 export { ElementIcon } from './ElementIcon';
 export { EndEventIcon } from './EndEventIcon';
 export { FeedbackTaskIcon } from './FeedbackTaskIcon';
@@ -18,6 +21,9 @@ export { LongTextIcon } from './LongTextIcon';
 export { NavBarIcon } from './NavBarIcon';
 export { NumberIcon } from './NumberIcon';
 export { ObjectIcon } from './ObjectIcon';
+export { OrgResourceIcon } from './OrgResourceIcon';
+export { OperationStatusResourceIcon } from './OperationStatusResourceIcon';
+export { RoadmapResourceIcon } from './RoadmapResourceIcon';
 export { TextIcon } from './TextIcon';
 export { PaymentDetailsIcon } from './PaymentDetailsIcon';
 export { PaymentTaskIcon } from './PaymentTaskIcon';
diff --git a/frontend/libs/studio-pure-functions/src/FileNameUtils/FilenameUtils.test.ts b/frontend/libs/studio-pure-functions/src/FileNameUtils/FilenameUtils.test.ts
new file mode 100644
index 00000000000..ae51eb22ec8
--- /dev/null
+++ b/frontend/libs/studio-pure-functions/src/FileNameUtils/FilenameUtils.test.ts
@@ -0,0 +1,93 @@
+import { FileNameUtils } from './FilenameUtils';
+
+describe('FileNameUtils', () => {
+  describe('removeExtension', () => {
+    it('Removes extension from filename if it exists', () => {
+      expect(FileNameUtils.removeExtension('filename.txt')).toEqual('filename');
+      expect(FileNameUtils.removeExtension('filename.xsd')).toEqual('filename');
+      expect(FileNameUtils.removeExtension('.abc')).toEqual('');
+      expect(FileNameUtils.removeExtension('filename.schema.json')).toEqual('filename.schema');
+    });
+
+    it('Removes the extension for filenames with special characters', () => {
+      expect(FileNameUtils.removeExtension('file name.txt')).toBe('file name');
+      expect(FileNameUtils.removeExtension('my-file.name$!.txt')).toBe('my-file.name$!');
+      expect(FileNameUtils.removeExtension('.hiddenfile.txt')).toBe('.hiddenfile');
+      expect(FileNameUtils.removeExtension('file123.456.txt')).toBe('file123.456');
+    });
+
+    it('Returns same input string if there is no extension', () => {
+      expect(FileNameUtils.removeExtension('filename')).toEqual('filename');
+      expect(FileNameUtils.removeExtension('')).toEqual('');
+    });
+
+    it('returns an empty string if the filename starts with dot', () => {
+      expect(FileNameUtils.removeExtension('.hiddenfile')).toBe('');
+      expect(FileNameUtils.removeExtension('.')).toBe('');
+    });
+  });
+
+  describe('removeSchemaExtension', () => {
+    it('Removes .schema.json extension from filename if it exists', () => {
+      expect(FileNameUtils.removeSchemaExtension('filename.schema.json')).toEqual('filename');
+      expect(FileNameUtils.removeSchemaExtension('filename.SCHEMA.JSON')).toEqual('filename');
+    });
+
+    it('Removes .xsd extension from filename if it exists', () => {
+      expect(FileNameUtils.removeSchemaExtension('filename.xsd')).toEqual('filename');
+      expect(FileNameUtils.removeSchemaExtension('filename.XSD')).toEqual('filename');
+    });
+
+    it('Returns entire input string if there is no .schema.json or .xsd extension', () => {
+      expect(FileNameUtils.removeSchemaExtension('filename.xml')).toEqual('filename.xml');
+    });
+  });
+
+  describe('isXsdFile', () => {
+    it('Returns true if filename has an XSD extension', () => {
+      expect(FileNameUtils.isXsdFile('filename.xsd')).toBe(true);
+      expect(FileNameUtils.isXsdFile('filename.XSD')).toBe(true);
+    });
+
+    it('Returns false if filename does not have an XSD extension', () => {
+      expect(FileNameUtils.isXsdFile('filename.schema.json')).toBe(false);
+      expect(FileNameUtils.isXsdFile('filename')).toBe(false);
+    });
+  });
+
+  describe('extractFilename', () => {
+    it('Returns filename if path contains a slash', () => {
+      expect(FileNameUtils.extractFilename('/path/to/filename')).toEqual('filename');
+      expect(FileNameUtils.extractFilename('/path/to/filename.json')).toEqual('filename.json');
+    });
+
+    it('Returns path if path does not contain a slash', () => {
+      expect(FileNameUtils.extractFilename('filename')).toEqual('filename');
+      expect(FileNameUtils.extractFilename('filename.json')).toEqual('filename.json');
+    });
+  });
+
+  describe('removeFileNameFromPath', () => {
+    it('Returns file path without file name', () => {
+      expect(FileNameUtils.removeFileNameFromPath('/path/to/filename')).toEqual('/path/to/');
+      expect(FileNameUtils.removeFileNameFromPath('/path/to/filename.json')).toEqual('/path/to/');
+    });
+
+    it('Returns file path without file name and last slash if "excludeLastSlash" is true', () => {
+      expect(FileNameUtils.removeFileNameFromPath('/path/to/filename', true)).toEqual('/path/to');
+      expect(FileNameUtils.removeFileNameFromPath('/path/to/filename.json', true)).toEqual(
+        '/path/to',
+      );
+    });
+
+    it('Returns empty string if path is only fileName', () => {
+      expect(FileNameUtils.removeFileNameFromPath('filename')).toEqual('');
+      expect(FileNameUtils.removeFileNameFromPath('filename.json')).toEqual('');
+    });
+
+    it('Returns empty string if path is only fileName and "excludeLastSlash" is true', () => {
+      expect(FileNameUtils.removeFileNameFromPath('filename', true)).toEqual('');
+      expect(FileNameUtils.removeFileNameFromPath('filename.json', true)).toEqual('');
+    });
+  });
+});
diff --git a/frontend/libs/studio-pure-functions/src/FileNameUtils/FilenameUtils.ts b/frontend/libs/studio-pure-functions/src/FileNameUtils/FilenameUtils.ts
new file mode 100644
index 00000000000..fdd8b63c166
--- /dev/null
+++ b/frontend/libs/studio-pure-functions/src/FileNameUtils/FilenameUtils.ts
@@ -0,0 +1,42 @@
+import { StringUtils } from '@studio/pure-functions';
+
+export class FileNameUtils {
+  /**
+   * Remove extension from filename.
+   * @param filename
+   * @returns filename without extension
+   */
+  static removeExtension = (filename: string): string => {
+    const indexOfLastDot = filename.lastIndexOf('.');
+    return indexOfLastDot < 0 ? filename : filename.substring(0, indexOfLastDot);
+  };
+
+  /**
+   * Remove json.schema or .xsd extension from filename.
+   * @param filename
+   * @returns filename without extension if the extension is ".schema.json" or ".xsd", otherwise the filename is returned unchanged.
+   */
+  static removeSchemaExtension = (filename: string): string =>
+    StringUtils.removeEnd(filename, '.schema.json', '.xsd');
+
+  /**
+   * Remove json.schema or .xsd extension from filename.
+   * @param filename
+   * @returns filename without extension if the extension is ".schema.json" or ".xsd", otherwise the filename is returned unchanged.
+   */
+  static isXsdFile = (filename: string): boolean => filename.toLowerCase().endsWith('.xsd');
+
+  static extractFilename = (path: string): string => {
+    const indexOfLastSlash = path.lastIndexOf('/');
+    return indexOfLastSlash < 0 ? path : path.substring(indexOfLastSlash + 1);
+  };
+
+  static removeFileNameFromPath = (path: string, excludeLastSlash: boolean = false): string => {
+    const fileName = this.extractFilename(path);
+    const indexOfLastSlash = path.lastIndexOf('/');
+    return path.slice(
+      0,
+      path.lastIndexOf(excludeLastSlash && indexOfLastSlash > 0 ? '/' + fileName : fileName),
+    );
+  };
+}
diff --git a/frontend/libs/studio-pure-functions/src/FileNameUtils/index.ts b/frontend/libs/studio-pure-functions/src/FileNameUtils/index.ts
new file mode 100644
index 00000000000..179352dfda5
--- /dev/null
+++ b/frontend/libs/studio-pure-functions/src/FileNameUtils/index.ts
@@ -0,0 +1 @@
+export { FileNameUtils } from './FilenameUtils';
diff --git a/frontend/libs/studio-pure-functions/src/index.ts b/frontend/libs/studio-pure-functions/src/index.ts
index a9414d7bece..566087a5f25 100644
--- a/frontend/libs/studio-pure-functions/src/index.ts
+++ b/frontend/libs/studio-pure-functions/src/index.ts
@@ -1,6 +1,7 @@
 export * from './ArrayUtils';
 export * from './BlobDownloader';
 export * from './DateUtils';
+export * from './FileNameUtils';
 export * from './NumberUtils';
 export * from './ObjectUtils';
 export * from './ScopedStorage';
diff --git a/frontend/packages/shared/src/api/paths.js b/frontend/packages/shared/src/api/paths.js
index 0f3c86db231..545ac846aaf 100644
--- a/frontend/packages/shared/src/api/paths.js
+++ b/frontend/packages/shared/src/api/paths.js
@@ -16,7 +16,11 @@ export const serviceConfigPath = (org, app) => `${basePath}/${org}/${app}/config
 
 // DataModel
 export const createDataModelPath = (org, app) => `${basePath}/${org}/${app}/datamodels/new`; // Post
-export const dataModelPath = (org, app, modelPath, saveOnly = false) => `${basePath}/${org}/${app}/datamodels/datamodel?${s({ modelPath, saveOnly })}`; // Get, Put, Delete
+export const dataModelPath = (org, app, modelPath, saveOnly = false) =>
+  `${basePath}/${org}/${app}/datamodels/datamodel?${s({
+    modelPath,
+    saveOnly,
+  })}`; // Get, Put, Delete
 export const dataModelsPath = (org, app) => `${basePath}/${org}/${app}/datamodels/all-json`; // Get
 export const dataModelsXsdPath = (org, app) => `${basePath}/${org}/${app}/datamodels/all-xsd`; // Get
 export const dataModelsUploadPath = (org, app) => `${basePath}/${org}/${app}/datamodels/upload`; // Post
@@ -89,7 +93,12 @@ export const envConfigPath = () => `${basePath}/environments`;
 export const abortmergePath = (org, app) => `${basePath}/repos/repo/${org}/${app}/abort-merge`;
 export const branchStatusPath = (org, app, branch) => `${basePath}/repos/repo/${org}/${app}/branches/branch?${s({ branch })}`; // Get
 export const cloneAppPath = (org, app) => `${basePath}/repos/repo/${org}/${app}/clone`; // Get
-export const copyAppPath = (org, sourceRepository, targetRepository, targetOrg) => `${basePath}/repos/repo/${org}/copy-app?${s({ sourceRepository, targetRepository, targetOrg })}`;
+export const copyAppPath = (org, sourceRepository, targetRepository, targetOrg) =>
+  `${basePath}/repos/repo/${org}/copy-app?${s({
+    sourceRepository,
+    targetRepository,
+    targetOrg,
+  })}`;
 export const createRepoPath = () => `${basePath}/repos/create-app`; // Post
 export const discardChangesPath = (org, app) => `${basePath}/repos/repo/${org}/${app}/discard`; // Get
 export const discardFileChangesPath = (org, app, filename) => `${basePath}/repos/repo/${org}/${app}/discard/${filename}`; // Get
diff --git a/frontend/packages/shared/src/api/queries.ts b/frontend/packages/shared/src/api/queries.ts
index c7d1ded93f8..279f9e03379 100644
--- a/frontend/packages/shared/src/api/queries.ts
+++ b/frontend/packages/shared/src/api/queries.ts
@@ -82,8 +82,24 @@ import type { FormLayoutsResponseV3 } from 'app-shared/types/api/FormLayoutsResp
 import type { Policy } from 'app-shared/types/Policy';
 import type { RepoDiffResponse } from 'app-shared/types/api/RepoDiffResponse';
 import type { ExternalImageUrlValidationResponse } from 'app-shared/types/api/ExternalImageUrlValidationResponse';
+import type { MaskinportenScope } from 'app-shared/types/MaskinportenScope';
 import type { OptionsLists } from 'app-shared/types/api/OptionsLists';
 
+export const getIsLoggedInWithAnsattporten = async (): Promise<boolean> =>
+  // TODO: replace with endpoint when it's ready in the backend.
+  new Promise((resolve) => {
+    setTimeout(() => {
+      return resolve(false);
+    }, 1000);
+  });
+export const getMaskinportenScopes = async (): Promise<MaskinportenScope[]> =>
+  // TODO: replace with endpoint when it's ready in the backend.
+  new Promise((resolve) => {
+    setTimeout(() => {
+      return resolve([]);
+    }, 1000);
+  });
+
 export const getAppMetadataModelIds = (org: string, app: string, onlyUnReferenced: boolean) => get<string[]>(appMetadataModelIdsPath(org, app, onlyUnReferenced));
 export const getAppReleases = (owner: string, app: string) => get<AppReleasesResponse>(releasesPath(owner, app, 'Descending'));
 export const getAppVersion = (org: string, app: string) => get<AppVersion>(appVersionPath(org, app));
diff --git a/frontend/packages/shared/src/components/GiteaHeader/VersionControlButtons/components/ShareChangesPopover/CommitAndPushContent/FileChangesInfoModal/FilePath/FilePath.tsx b/frontend/packages/shared/src/components/GiteaHeader/VersionControlButtons/components/ShareChangesPopover/CommitAndPushContent/FileChangesInfoModal/FilePath/FilePath.tsx
index 586600945b2..b8a53179474 100644
--- a/frontend/packages/shared/src/components/GiteaHeader/VersionControlButtons/components/ShareChangesPopover/CommitAndPushContent/FileChangesInfoModal/FilePath/FilePath.tsx
+++ b/frontend/packages/shared/src/components/GiteaHeader/VersionControlButtons/components/ShareChangesPopover/CommitAndPushContent/FileChangesInfoModal/FilePath/FilePath.tsx
@@ -4,7 +4,7 @@ import cn from 'classnames';
 import { convertPureGitDiffToUserFriendlyDiff } from './FilePathUtils';
 import { ChevronRightIcon } from '@studio/icons';
 import { useTranslation } from 'react-i18next';
-import { extractFilename, removeFileNameFromPath } from 'app-shared/utils/filenameUtils';
+import { FileNameUtils } from '@studio/pure-functions';
 import type { QueryStatus } from '@tanstack/react-query';
 
 export interface FilePathProps {
@@ -20,7 +20,7 @@ export const FilePath = ({ filePath, diff, repoDiffStatus }: FilePathProps) => {
     return <FilePathWithoutDiff filePath={filePath} />;
   }
 
-  const fileName = extractFilename(filePath);
+  const fileName = FileNameUtils.extractFilename(filePath);
   const linesToRender = convertPureGitDiffToUserFriendlyDiff(diff);
 
   return (
@@ -56,8 +56,8 @@ type FormattedFilePathProps = {
 };
 
 const FormattedFilePath = ({ filePath }: FormattedFilePathProps) => {
-  const fileName = extractFilename(filePath);
-  const filePathWithoutName = removeFileNameFromPath(filePath, true);
+  const fileName = FileNameUtils.extractFilename(filePath);
+  const filePathWithoutName = FileNameUtils.removeFileNameFromPath(filePath, true);
 
   return (
     <>
diff --git a/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.test.ts b/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.test.ts
index 3cd151bdd7a..7ed8ac17e78 100644
--- a/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.test.ts
+++ b/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.test.ts
@@ -1,16 +1,21 @@
 import { app, org } from '@studio/testing/testids';
-import { queriesMock } from 'app-shared/mocks/queriesMock';
-import { renderHookWithProviders } from 'app-shared/mocks/renderHookWithProviders';
+import { queriesMock } from '../../mocks/queriesMock';
+import { renderHookWithProviders } from '../../mocks/renderHookWithProviders';
 import {
   type UpdateOptionListMutationArgs,
   useUpdateOptionListMutation,
 } from './useUpdateOptionListMutation';
-import type { Option } from 'app-shared/types/Option';
+import type { Option } from '../../types/Option';
+import { createQueryClientMock } from '../../mocks/queryClientMock';
+import { QueryKey } from 'app-shared/types/QueryKey';
 
 // Test data:
 const optionListId = 'test';
-const optionsList: Option[] = [{ value: 'test', label: 'test' }];
-const args: UpdateOptionListMutationArgs = { optionListId: optionListId, optionsList: optionsList };
+const option1: Option = { value: 'test', label: 'test' };
+const optionsList: Option[] = [option1];
+const updatedOptionsList: Option[] = [{ ...option1, description: 'description' }];
+const args: UpdateOptionListMutationArgs = { optionListId, optionsList };
+const updateOptionList = jest.fn().mockImplementation(() => Promise.resolve(updatedOptionsList));
 
 describe('useUpdateOptionListMutation', () => {
   test('Calls useUpdateOptionList with correct parameters', async () => {
@@ -21,4 +26,16 @@ describe('useUpdateOptionListMutation', () => {
     expect(queriesMock.updateOptionList).toHaveBeenCalledTimes(1);
     expect(queriesMock.updateOptionList).toHaveBeenCalledWith(org, app, optionListId, optionsList);
   });
+
+  test('Sets the updated option list on the cache', async () => {
+    const queryClient = createQueryClientMock();
+    const renderUpdateOptionListMutationResult = renderHookWithProviders(
+      () => useUpdateOptionListMutation(org, app),
+      { queries: { updateOptionList }, queryClient },
+    ).result;
+    await renderUpdateOptionListMutationResult.current.mutateAsync(args);
+    expect(queryClient.getQueryData([QueryKey.OptionLists, org, app])).toEqual({
+      test: updatedOptionsList,
+    });
+  });
 });
diff --git a/frontend/packages/shared/src/mocks/mocks.ts b/frontend/packages/shared/src/mocks/mocks.ts
index 76cc018b142..380f5250760 100644
--- a/frontend/packages/shared/src/mocks/mocks.ts
+++ b/frontend/packages/shared/src/mocks/mocks.ts
@@ -26,7 +26,6 @@ import type { Organization } from 'app-shared/types/Organization';
 import type { KubernetesDeployment } from 'app-shared/types/api/KubernetesDeployment';
 import type { DeploymentsResponse } from 'app-shared/types/api/DeploymentsResponse';
 import type { AppRelease } from 'app-shared/types/AppRelease';
-import type { Option } from 'app-shared/types/Option';
 
 export const build: Build = {
   id: '',
@@ -245,7 +244,3 @@ export const searchRepositoryResponse: SearchRepositoryResponse = {
   totalCount: 0,
   totalPages: 0,
 };
-
-export const updateOptionListResponse: Option[] = [
-  { value: '', label: '', description: '', helpText: '' },
-];
diff --git a/frontend/packages/shared/src/mocks/queriesMock.ts b/frontend/packages/shared/src/mocks/queriesMock.ts
index 142f5ddde67..28fa137c748 100644
--- a/frontend/packages/shared/src/mocks/queriesMock.ts
+++ b/frontend/packages/shared/src/mocks/queriesMock.ts
@@ -63,14 +63,13 @@ import {
   textResourcesWithLanguage,
   user,
   validation,
-  updateOptionListResponse,
 } from './mocks';
 import type { FormLayoutsResponseV3 } from 'app-shared/types/api/FormLayoutsResponseV3';
 import type { DeploymentsResponse } from 'app-shared/types/api/DeploymentsResponse';
 import type { RepoDiffResponse } from 'app-shared/types/api/RepoDiffResponse';
 import type { ExternalImageUrlValidationResponse } from 'app-shared/types/api/ExternalImageUrlValidationResponse';
+import type { MaskinportenScope } from 'app-shared/types/MaskinportenScope';
 import type { OptionsLists } from 'app-shared/types/api/OptionsLists';
-import type { Option } from 'app-shared/types/Option';
 
 export const queriesMock: ServicesContextProps = {
   // Queries
@@ -169,6 +168,12 @@ export const queriesMock: ServicesContextProps = {
   // Queries - PrgetBpmnFile
   getBpmnFile: jest.fn().mockImplementation(() => Promise.resolve<string>('')),
   getProcessTaskType: jest.fn().mockImplementation(() => Promise.resolve<string>('')),
+  getIsLoggedInWithAnsattporten: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve<boolean>(false)),
+  getMaskinportenScopes: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve<MaskinportenScope[]>([])),
 
   // Mutations
   addAppAttachmentMetadata: jest.fn().mockImplementation(() => Promise.resolve()),
@@ -214,9 +219,7 @@ export const queriesMock: ServicesContextProps = {
   updateAppPolicy: jest.fn().mockImplementation(() => Promise.resolve()),
   updateAppMetadata: jest.fn().mockImplementation(() => Promise.resolve()),
   updateAppConfig: jest.fn().mockImplementation(() => Promise.resolve()),
-  updateOptionList: jest
-    .fn()
-    .mockImplementation(() => Promise.resolve<Option[]>(updateOptionListResponse)),
+  updateOptionList: jest.fn().mockImplementation(() => Promise.resolve()),
   uploadDataModel: jest.fn().mockImplementation(() => Promise.resolve<JsonSchema>({})),
   uploadOptionList: jest.fn().mockImplementation(() => Promise.resolve()),
   upsertTextResources: jest
diff --git a/frontend/packages/shared/src/types/ComponentSpecificConfig.ts b/frontend/packages/shared/src/types/ComponentSpecificConfig.ts
index d36b87df446..9dbccf45a19 100644
--- a/frontend/packages/shared/src/types/ComponentSpecificConfig.ts
+++ b/frontend/packages/shared/src/types/ComponentSpecificConfig.ts
@@ -285,12 +285,6 @@ export type ComponentSpecificConfig<T extends ComponentType = ComponentType> = {
       dataModelBindings: DataModelBindingsLikert;
       filter?: { key: 'start' | 'stop'; value: string | number };
     };
-  [ComponentType.LikertItem]: FormComponentProps &
-    SummarizableComponentProps &
-    SelectionComponentFull & {
-      dataModelBindings: DataModelBindingsOptionsSimple;
-      layout?: LayoutStyle;
-    };
   [ComponentType.Link]: {
     style: 'primary' | 'secondary' | 'link';
     openInNewTab?: boolean;
diff --git a/frontend/packages/shared/src/types/ComponentType.ts b/frontend/packages/shared/src/types/ComponentType.ts
index 7fa28585a34..51f7b0b46bc 100644
--- a/frontend/packages/shared/src/types/ComponentType.ts
+++ b/frontend/packages/shared/src/types/ComponentType.ts
@@ -23,7 +23,6 @@ export enum ComponentType {
   InstanceInformation = 'InstanceInformation',
   InstantiationButton = 'InstantiationButton',
   Likert = 'Likert',
-  LikertItem = 'LikertItem',
   Link = 'Link',
   List = 'List',
   Map = 'Map',
diff --git a/frontend/packages/shared/src/types/MaskinportenScope.ts b/frontend/packages/shared/src/types/MaskinportenScope.ts
new file mode 100644
index 00000000000..b3c2f41a848
--- /dev/null
+++ b/frontend/packages/shared/src/types/MaskinportenScope.ts
@@ -0,0 +1,4 @@
+export type MaskinportenScope = {
+  scope: string;
+  description: string;
+};
diff --git a/frontend/packages/shared/src/types/QueryKey.ts b/frontend/packages/shared/src/types/QueryKey.ts
index f3542c6f927..e1f351b611a 100644
--- a/frontend/packages/shared/src/types/QueryKey.ts
+++ b/frontend/packages/shared/src/types/QueryKey.ts
@@ -44,6 +44,8 @@ export enum QueryKey {
   TextResources = 'TextResources',
   Widgets = 'Widgets',
   AppConfig = 'AppConfig',
+  IsLoggedInWithAnsattporten = 'IsLoggedInWithAnsattporten',
+  AppScopes = 'AppScopes',
 
   // Resourceadm
   ResourceList = 'ResourceList',
diff --git a/frontend/packages/shared/src/utils/featureToggleUtils.ts b/frontend/packages/shared/src/utils/featureToggleUtils.ts
index 9522a3ab11e..6314d0254d2 100644
--- a/frontend/packages/shared/src/utils/featureToggleUtils.ts
+++ b/frontend/packages/shared/src/utils/featureToggleUtils.ts
@@ -13,7 +13,9 @@ export type SupportedFeatureFlags =
   | 'addComponentModal'
   | 'subform'
   | 'summary2'
-  | 'optionListEditor';
+  | 'codeListEditor'
+  | 'optionListEditor'
+  | 'maskinporten';
 
 /*
  * Please add all the features that you want to be toggle on by default here.
diff --git a/frontend/packages/shared/src/utils/filenameUtils.test.ts b/frontend/packages/shared/src/utils/filenameUtils.test.ts
deleted file mode 100644
index 4756e8a6d1a..00000000000
--- a/frontend/packages/shared/src/utils/filenameUtils.test.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import {
-  extractFilename,
-  isXsdFile,
-  removeExtension,
-  removeFileNameFromPath,
-  removeSchemaExtension,
-} from 'app-shared/utils/filenameUtils';
-
-describe('filenameUtils', () => {
-  describe('removeExtension', () => {
-    it('Removes extension from filename if it exists', () => {
-      expect(removeExtension('filename.txt')).toEqual('filename');
-      expect(removeExtension('filename.xsd')).toEqual('filename');
-      expect(removeExtension('.abc')).toEqual('');
-      expect(removeExtension('filename.schema.json')).toEqual('filename.schema');
-    });
-
-    it('Returns entire input string if there is no extension', () => {
-      expect(removeExtension('filename')).toEqual('filename');
-    });
-  });
-
-  describe('removeSchemaExtension', () => {
-    it('Removes .schema.json extension from filename if it exists', () => {
-      expect(removeSchemaExtension('filename.schema.json')).toEqual('filename');
-      expect(removeSchemaExtension('filename.SCHEMA.JSON')).toEqual('filename');
-    });
-
-    it('Removes .xsd extension from filename if it exists', () => {
-      expect(removeSchemaExtension('filename.xsd')).toEqual('filename');
-      expect(removeSchemaExtension('filename.XSD')).toEqual('filename');
-    });
-
-    it('Returns entire input string if there is no .schema.json or .xsd extension', () => {
-      expect(removeSchemaExtension('filename.xml')).toEqual('filename.xml');
-    });
-  });
-
-  describe('isXsdFile', () => {
-    it('Returns true if filename has an XSD extension', () => {
-      expect(isXsdFile('filename.xsd')).toBe(true);
-      expect(isXsdFile('filename.XSD')).toBe(true);
-    });
-
-    it('Returns false if filename does not have an XSD extension', () => {
-      expect(isXsdFile('filename.schema.json')).toBe(false);
-      expect(isXsdFile('filename')).toBe(false);
-    });
-  });
-
-  describe('extractFilename', () => {
-    it('Returns filename if path contains a slash', () => {
-      expect(extractFilename('/path/to/filename')).toEqual('filename');
-      expect(extractFilename('/path/to/filename.json')).toEqual('filename.json');
-    });
-
-    it('Returns path if path does not contain a slash', () => {
-      expect(extractFilename('filename')).toEqual('filename');
-      expect(extractFilename('filename.json')).toEqual('filename.json');
-    });
-  });
-
-  describe('removeFileNameFromPath', () => {
-    it('Returns file path without file name', () => {
-      expect(removeFileNameFromPath('/path/to/filename')).toEqual('/path/to/');
-      expect(removeFileNameFromPath('/path/to/filename.json')).toEqual('/path/to/');
-    });
-
-    it('Returns file path without file name and last slash if "excludeLastSlash" is true', () => {
-      expect(removeFileNameFromPath('/path/to/filename', true)).toEqual('/path/to');
-      expect(removeFileNameFromPath('/path/to/filename.json', true)).toEqual('/path/to');
-    });
-
-    it('Returns empty string if path is only fileName', () => {
-      expect(removeFileNameFromPath('filename')).toEqual('');
-      expect(removeFileNameFromPath('filename.json')).toEqual('');
-    });
-
-    it('Returns empty string if path is only fileName and "excludeLastSlash" is true', () => {
-      expect(removeFileNameFromPath('filename', true)).toEqual('');
-      expect(removeFileNameFromPath('filename.json', true)).toEqual('');
-    });
-  });
-});
diff --git a/frontend/packages/shared/src/utils/filenameUtils.ts b/frontend/packages/shared/src/utils/filenameUtils.ts
deleted file mode 100644
index 36eefe53a8c..00000000000
--- a/frontend/packages/shared/src/utils/filenameUtils.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { StringUtils } from '@studio/pure-functions';
-
-/**
- * Remove extension from filename.
- * @param filename
- * @returns filename without extension
- */
-export const removeExtension = (filename: string): string => {
-  const indexOfLastDot = filename.lastIndexOf('.');
-  return indexOfLastDot < 0 ? filename : filename.substring(0, indexOfLastDot);
-};
-
-/**
- * Remove json.schema or .xsd extension from filename.
- * @param filename
- * @returns filename without extension if the extension is ".schema.json" or ".xsd", otherwise the filename is returned unchanged.
- */
-export const removeSchemaExtension = (filename: string): string =>
-  StringUtils.removeEnd(filename, '.schema.json', '.xsd');
-
-/**
- * Check if filename has an XSD extension.
- * @param filename
- * @returns true if filename has an XSD extension, otherwise false.
- */
-export const isXsdFile = (filename: string): boolean => filename.toLowerCase().endsWith('.xsd');
-
-export const extractFilename = (path: string): string => {
-  const indexOfLastSlash = path.lastIndexOf('/');
-  return indexOfLastSlash < 0 ? path : path.substring(indexOfLastSlash + 1);
-};
-
-export const removeFileNameFromPath = (path: string, excludeLastSlash: boolean = false): string => {
-  const fileName = extractFilename(path);
-  const indexOfLastSlash = path.lastIndexOf('/');
-  return path.slice(
-    0,
-    path.lastIndexOf(excludeLastSlash && indexOfLastSlash > 0 ? '/' + fileName : fileName),
-  );
-};
diff --git a/frontend/packages/text-editor/src/hooks/useLayoutNamesQuery.ts b/frontend/packages/text-editor/src/hooks/useLayoutNamesQuery.ts
index df114bbb7b3..4bd2c47aa1e 100644
--- a/frontend/packages/text-editor/src/hooks/useLayoutNamesQuery.ts
+++ b/frontend/packages/text-editor/src/hooks/useLayoutNamesQuery.ts
@@ -2,13 +2,15 @@ import type { UseQueryResult } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
 import { useServicesContext } from 'app-shared/contexts/ServicesContext';
 import { QueryKey } from 'app-shared/types/QueryKey';
-import { removeExtension } from 'app-shared/utils/filenameUtils';
+import { FileNameUtils } from '@studio/pure-functions';
 
 export const useLayoutNamesQuery = (owner, app): UseQueryResult<string[]> => {
   const { getLayoutNames } = useServicesContext();
   return useQuery<string[]>({
     queryKey: [QueryKey.LayoutNames, owner, app],
     queryFn: () =>
-      getLayoutNames(owner, app).then((layoutNames) => layoutNames.map(removeExtension)),
+      getLayoutNames(owner, app).then((layoutNames) =>
+        layoutNames.map(FileNameUtils.removeExtension),
+      ),
   });
 };
diff --git a/frontend/packages/ux-editor/src/components/Elements/LayoutSetsContainer.test.tsx b/frontend/packages/ux-editor/src/components/Elements/LayoutSetsContainer.test.tsx
index 7d1097e8149..91c4f3d33e4 100644
--- a/frontend/packages/ux-editor/src/components/Elements/LayoutSetsContainer.test.tsx
+++ b/frontend/packages/ux-editor/src/components/Elements/LayoutSetsContainer.test.tsx
@@ -7,6 +7,7 @@ import { renderWithProviders } from '../../testing/mocks';
 import {
   layoutSet1NameMock,
   layoutSet2NameMock,
+  layoutSet3SubformNameMock,
   layoutSetsMock,
 } from '../../testing/layoutSetsMock';
 import { QueryKey } from 'app-shared/types/QueryKey';
@@ -34,6 +35,11 @@ describe('LayoutSetsContainer', () => {
     expect(await screen.findByRole('option', { name: layoutSetName2 })).toBeInTheDocument();
   });
 
+  it('should not render combobox when there are no layoutSets', async () => {
+    render({ sets: null });
+    expect(screen.queryByRole('combobox')).not.toBeInTheDocument();
+  });
+
   it('Should update with selected layout', async () => {
     render();
     const user = userEvent.setup();
@@ -51,15 +57,12 @@ describe('LayoutSetsContainer', () => {
     expect(appContextMock.onLayoutSetNameChange).toHaveBeenCalledWith('test-layout-set-2');
   });
 
-  it('should render add and delete subform buttons when feature is enabled', () => {
+  it('should render the delete subform button when feature is enabled and selected layoutset is a subform', () => {
     addFeatureFlagToLocalStorage('subform');
-
-    render();
-    const createSubformButton = screen.getByRole('button', {
-      name: textMock('ux_editor.create.subform'),
-    });
-    expect(createSubformButton).toBeInTheDocument();
-
+    render(
+      { sets: [{ id: layoutSet3SubformNameMock, type: 'subform' }] },
+      { selectedlayoutSet: layoutSet3SubformNameMock },
+    );
     const deleteSubformButton = screen.getByRole('button', {
       name: textMock('ux_editor.delete.subform'),
     });
@@ -67,13 +70,21 @@ describe('LayoutSetsContainer', () => {
     removeFeatureFlagFromLocalStorage('subform');
   });
 
-  it('should not render add and delete subform buttons when feature is disabled', () => {
-    render();
-    const createSubformButton = screen.queryByRole('button', {
-      name: textMock('ux_editor.create.subform'),
+  it('should not render the delete subform button when feature is enabled and selected layoutset is not a subform', () => {
+    addFeatureFlagToLocalStorage('subform');
+    render(
+      { sets: [{ id: layoutSet1NameMock, dataType: 'data-model' }] },
+      { selectedlayoutSet: layoutSet1NameMock },
+    );
+    const deleteSubformButton = screen.queryByRole('button', {
+      name: textMock('ux_editor.delete.subform'),
     });
-    expect(createSubformButton).not.toBeInTheDocument();
+    expect(deleteSubformButton).not.toBeInTheDocument();
+    removeFeatureFlagFromLocalStorage('subform');
+  });
 
+  it('should not render the delete subform button when feature is disabled', () => {
+    render();
     const deleteSubformButton = screen.queryByRole('button', {
       name: textMock('ux_editor.delete.subform'),
     });
@@ -81,7 +92,8 @@ describe('LayoutSetsContainer', () => {
   });
 });
 
-const render = () => {
-  queryClientMock.setQueryData([QueryKey.LayoutSets, org, app], layoutSetsMock);
+const render = (layoutSetsData = layoutSetsMock, options: { selectedlayoutSet?: string } = {}) => {
+  queryClientMock.setQueryData([QueryKey.LayoutSets, org, app], layoutSetsData);
+  appContextMock.selectedFormLayoutSetName = options.selectedlayoutSet || layoutSetName1;
   return renderWithProviders(<LayoutSetsContainer />);
 };
diff --git a/frontend/packages/ux-editor/src/components/Elements/LayoutSetsContainer.tsx b/frontend/packages/ux-editor/src/components/Elements/LayoutSetsContainer.tsx
index d9faf1b9839..64a0bb3d73f 100644
--- a/frontend/packages/ux-editor/src/components/Elements/LayoutSetsContainer.tsx
+++ b/frontend/packages/ux-editor/src/components/Elements/LayoutSetsContainer.tsx
@@ -5,8 +5,8 @@ import { useText, useAppContext } from '../../hooks';
 import classes from './LayoutSetsContainer.module.css';
 import { ExportForm } from './ExportForm';
 import { shouldDisplayFeature } from 'app-shared/utils/featureToggleUtils';
-import { SubformWrapper } from './Subform/SubformWrapper';
 import { StudioCombobox } from '@studio/components';
+import { DeleteSubformWrapper } from './Subform/DeleteSubformWrapper';
 
 export function LayoutSetsContainer() {
   const { org, app } = useStudioEnvironmentParams();
@@ -59,9 +59,8 @@ export function LayoutSetsContainer() {
       </StudioCombobox>
       {shouldDisplayFeature('exportForm') && <ExportForm />}
       {shouldDisplayFeature('subform') && (
-        <SubformWrapper
+        <DeleteSubformWrapper
           layoutSets={layoutSetsResponse}
-          onSubformCreated={handleLayoutSetChange}
           selectedLayoutSet={selectedFormLayoutSetName}
         />
       )}
diff --git a/frontend/packages/ux-editor/src/components/Elements/Subform/CreateSubformWrapper.module.css b/frontend/packages/ux-editor/src/components/Elements/Subform/CreateSubformWrapper.module.css
deleted file mode 100644
index 2556ef58c2e..00000000000
--- a/frontend/packages/ux-editor/src/components/Elements/Subform/CreateSubformWrapper.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.confirmCreateButton {
-  margin-top: var(--fds-spacing-2);
-}
diff --git a/frontend/packages/ux-editor/src/components/Elements/Subform/CreateSubformWrapper.test.tsx b/frontend/packages/ux-editor/src/components/Elements/Subform/CreateSubformWrapper.test.tsx
deleted file mode 100644
index 28a621369f5..00000000000
--- a/frontend/packages/ux-editor/src/components/Elements/Subform/CreateSubformWrapper.test.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import React from 'react';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { renderWithProviders } from '../../../testing/mocks';
-import { CreateSubformWrapper } from './CreateSubformWrapper';
-import { textMock } from '@studio/testing/mocks/i18nMock';
-import { app, org } from '@studio/testing/testids';
-import { layoutSetsMock, layoutSet1NameMock } from '@altinn/ux-editor/testing/layoutSetsMock';
-import type { ServicesContextProps } from 'app-shared/contexts/ServicesContext';
-
-const subformName = 'underskjema';
-
-describe('CreateSubformWrapper', () => {
-  it('should open dialog when clicking "create subform" button', async () => {
-    const user = userEvent.setup();
-    renderCreateSubformWrapper();
-
-    const createSubformButton = screen.getByRole('button', {
-      name: textMock('ux_editor.create.subform'),
-    });
-    await user.click(createSubformButton);
-
-    expect(await screen.findByRole('dialog')).toBeInTheDocument();
-  });
-
-  it('should call onSubformCreated when subform is created', async () => {
-    const user = userEvent.setup();
-    const onSubformCreated = jest.fn();
-    renderCreateSubformWrapper(onSubformCreated);
-
-    const createSubformButton = screen.getByRole('button', {
-      name: textMock('ux_editor.create.subform'),
-    });
-    await user.click(createSubformButton);
-
-    const input = screen.getByRole('textbox');
-    await user.type(input, subformName);
-
-    const confirmButton = screen.getByRole('button', {
-      name: textMock('ux_editor.create.subform.confirm_button'),
-    });
-    await user.click(confirmButton);
-    expect(onSubformCreated).toHaveBeenCalledWith(subformName);
-  });
-
-  it('should disable confirm button when name already exist', async () => {
-    const user = userEvent.setup();
-    renderCreateSubformWrapper();
-
-    const createSubformButton = screen.getByRole('button', {
-      name: textMock('ux_editor.create.subform'),
-    });
-    await user.click(createSubformButton);
-
-    const input = screen.getByRole('textbox');
-    await user.type(input, layoutSet1NameMock);
-
-    const confirmButton = screen.getByRole('button', {
-      name: textMock('ux_editor.create.subform.confirm_button'),
-    });
-    expect(confirmButton).toBeDisabled();
-  });
-
-  it('should add subform when name is valid', async () => {
-    const onSubformCreatedMock = jest.fn();
-    const user = userEvent.setup();
-    const addLayoutSet = jest.fn();
-
-    renderCreateSubformWrapper(onSubformCreatedMock, { addLayoutSet });
-
-    const createSubformButton = screen.getByRole('button', {
-      name: textMock('ux_editor.create.subform'),
-    });
-    await user.click(createSubformButton);
-
-    const input = screen.getByRole('textbox');
-    await user.type(input, subformName);
-
-    const confirmButton = screen.getByRole('button', {
-      name: textMock('ux_editor.create.subform.confirm_button'),
-    });
-    await user.click(confirmButton);
-    expect(addLayoutSet).toHaveBeenCalledWith(org, app, subformName, {
-      layoutSetConfig: { id: subformName, type: 'subform', dataType: '' },
-      taskType: undefined,
-    });
-  });
-
-  it('should show spinner when adding subform', async () => {
-    const user = userEvent.setup();
-
-    const addLayoutSetMock = jest.fn().mockImplementation(
-      () =>
-        new Promise((resolve) => {
-          setTimeout(resolve, 100);
-        }),
-    );
-
-    renderCreateSubformWrapper(undefined, { addLayoutSet: addLayoutSetMock });
-
-    const createSubformButton = screen.getByRole('button', {
-      name: textMock('ux_editor.create.subform'),
-    });
-    await user.click(createSubformButton);
-
-    const input = screen.getByRole('textbox');
-    await user.type(input, subformName);
-
-    const confirmButton = screen.getByRole('button', {
-      name: textMock('ux_editor.create.subform.confirm_button'),
-    });
-    await user.click(confirmButton);
-
-    const spinner = await screen.findByText(textMock('general.loading'));
-    expect(spinner).toBeInTheDocument();
-  });
-});
-
-const renderCreateSubformWrapper = (
-  onSubformCreated?: jest.Mock,
-  queries: Partial<ServicesContextProps> = {},
-) => {
-  return renderWithProviders(
-    <CreateSubformWrapper layoutSets={layoutSetsMock} onSubformCreated={onSubformCreated} />,
-    { queries },
-  );
-};
diff --git a/frontend/packages/ux-editor/src/components/Elements/Subform/CreateSubformWrapper.tsx b/frontend/packages/ux-editor/src/components/Elements/Subform/CreateSubformWrapper.tsx
deleted file mode 100644
index aee50d5ad6d..00000000000
--- a/frontend/packages/ux-editor/src/components/Elements/Subform/CreateSubformWrapper.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import React, { useState } from 'react';
-import { StudioButton, StudioPopover, StudioSpinner, StudioTextfield } from '@studio/components';
-import { PlusIcon } from '@studio/icons';
-import { useTranslation } from 'react-i18next';
-import { useValidateLayoutSetName } from 'app-shared/hooks/useValidateLayoutSetName';
-import type { LayoutSets } from 'app-shared/types/api/LayoutSetsResponse';
-import classes from './CreateSubformWrapper.module.css';
-import { useCreateSubform } from '@altinn/ux-editor/hooks/useCreateSubform';
-
-type CreateSubformWrapperProps = {
-  layoutSets: LayoutSets;
-  onSubformCreated: (layoutSetName: string) => void;
-};
-
-export const CreateSubformWrapper = ({
-  layoutSets,
-  onSubformCreated,
-}: CreateSubformWrapperProps) => {
-  const [createNewOpen, setCreateNewOpen] = useState(false);
-  const [newSubformName, setNewSubformName] = useState('');
-  const [nameError, setNameError] = useState('');
-  const { t } = useTranslation();
-  const { validateLayoutSetName } = useValidateLayoutSetName();
-  const { createSubform, isPendingLayoutSetMutation } = useCreateSubform();
-
-  const onCreateConfirmClick = () => {
-    setCreateNewOpen(false);
-    onSubformCreated(newSubformName);
-  };
-
-  const handleNameChange = (subformName: string) => {
-    const subformNameValidation = validateLayoutSetName(subformName, layoutSets);
-    setNameError(subformNameValidation);
-    setNewSubformName(subformName);
-  };
-  const handleCreateSubform = () => {
-    createSubform({
-      layoutSetName: newSubformName,
-      onSubformCreated: onCreateConfirmClick,
-      //setting datatype to empty string as this createSubform area is only temporary and will be removed in a later PR
-      dataType: '',
-    });
-  };
-
-  const createSubformButtonContent = isPendingLayoutSetMutation ? (
-    <StudioSpinner spinnerTitle={t('general.loading')} />
-  ) : (
-    t('ux_editor.create.subform.confirm_button')
-  );
-
-  return (
-    <StudioPopover
-      open={createNewOpen}
-      onOpenChange={!isPendingLayoutSetMutation && setCreateNewOpen}
-    >
-      <StudioPopover.Trigger asChild>
-        <StudioButton
-          icon={<PlusIcon />}
-          variant='tertiary'
-          onClick={() => setCreateNewOpen(!createNewOpen)}
-        >
-          {t('ux_editor.create.subform')}
-        </StudioButton>
-      </StudioPopover.Trigger>
-      <StudioPopover.Content>
-        <StudioTextfield
-          label={t('ux_editor.create.subform.label')}
-          size='small'
-          value={newSubformName}
-          onChange={(e) => handleNameChange(e.target.value)}
-          error={nameError}
-          disabled={isPendingLayoutSetMutation}
-        />
-        <StudioButton
-          className={classes.confirmCreateButton}
-          variant='secondary'
-          onClick={handleCreateSubform}
-          disabled={!newSubformName || !!nameError}
-        >
-          {createSubformButtonContent}
-        </StudioButton>
-      </StudioPopover.Content>
-    </StudioPopover>
-  );
-};
diff --git a/frontend/packages/ux-editor/src/components/Elements/Subform/DeleteSubformWrapper.module.css b/frontend/packages/ux-editor/src/components/Elements/Subform/DeleteSubformWrapper.module.css
new file mode 100644
index 00000000000..e3a8f933b21
--- /dev/null
+++ b/frontend/packages/ux-editor/src/components/Elements/Subform/DeleteSubformWrapper.module.css
@@ -0,0 +1,3 @@
+.button {
+  margin-left: var(--fds-spacing-2);
+}
diff --git a/frontend/packages/ux-editor/src/components/Elements/Subform/DeleteSubformWrapper.test.tsx b/frontend/packages/ux-editor/src/components/Elements/Subform/DeleteSubformWrapper.test.tsx
index 3fc14c032af..f1969aa5506 100644
--- a/frontend/packages/ux-editor/src/components/Elements/Subform/DeleteSubformWrapper.test.tsx
+++ b/frontend/packages/ux-editor/src/components/Elements/Subform/DeleteSubformWrapper.test.tsx
@@ -13,22 +13,21 @@ import { textMock } from '@studio/testing/mocks/i18nMock';
 import { app, org } from '@studio/testing/testids';
 
 describe('DeleteSubformWrapper', () => {
-  it('should disable delete button when selected layoutset is not a subform', () => {
+  it('should not render delete button when selected layout set is not a subform', () => {
     renderDeleteSubformWrapper(layoutSet1NameMock);
-
-    const deleteSubformButton = screen.getByRole('button', {
+    const deleteSubformButton = screen.queryByRole('button', {
       name: textMock('ux_editor.delete.subform'),
     });
-    expect(deleteSubformButton).toBeDisabled();
+    expect(deleteSubformButton).not.toBeInTheDocument();
   });
 
-  it('should enable delete button when selected layoutset is a subform', () => {
+  it('should render delete button when selected layoutset is a subform', () => {
     renderDeleteSubformWrapper(layoutSet3SubformNameMock);
 
     const deleteSubformButton = screen.getByRole('button', {
       name: textMock('ux_editor.delete.subform'),
     });
-    expect(deleteSubformButton).toBeEnabled();
+    expect(deleteSubformButton).toBeInTheDocument();
   });
 
   it('should not call deleteLayoutSet when delete button is clicked but not confirmed', async () => {
diff --git a/frontend/packages/ux-editor/src/components/Elements/Subform/DeleteSubformWrapper.tsx b/frontend/packages/ux-editor/src/components/Elements/Subform/DeleteSubformWrapper.tsx
index 3f771ed3c88..bf19eb554c4 100644
--- a/frontend/packages/ux-editor/src/components/Elements/Subform/DeleteSubformWrapper.tsx
+++ b/frontend/packages/ux-editor/src/components/Elements/Subform/DeleteSubformWrapper.tsx
@@ -5,6 +5,7 @@ import { useStudioEnvironmentParams } from 'app-shared/hooks/useStudioEnvironmen
 import type { LayoutSets } from 'app-shared/types/api/LayoutSetsResponse';
 import { useTranslation } from 'react-i18next';
 import { SubformUtils } from './SubformUtils';
+import classes from './DeleteSubformWrapper.module.css';
 
 type DeleteSubformWrapperProps = {
   layoutSets: LayoutSets;
@@ -19,19 +20,19 @@ export const DeleteSubformWrapper = ({
   const { mutate: deleteLayoutSet } = useDeleteLayoutSetMutation(org, app);
   const { t } = useTranslation();
 
-  const onDeleteSubform = () => {
-    deleteLayoutSet({ layoutSetIdToUpdate: selectedLayoutSet });
-  };
-
   const isRegularLayoutSet = !Boolean(
     SubformUtils.findSubformById(layoutSets.sets, selectedLayoutSet),
   );
+  if (isRegularLayoutSet) return;
+
+  const onDeleteSubform = () => {
+    deleteLayoutSet({ layoutSetIdToUpdate: selectedLayoutSet });
+  };
 
   return (
     <StudioDeleteButton
+      className={classes.button}
       onDelete={onDeleteSubform}
-      // Delete is only supported for sub-forms, not regular layout-sets
-      disabled={isRegularLayoutSet}
       variant='tertiary'
       confirmMessage={t('ux_editor.delete.subform.confirm')}
     >
diff --git a/frontend/packages/ux-editor/src/components/Elements/Subform/SubformWrapper.tsx b/frontend/packages/ux-editor/src/components/Elements/Subform/SubformWrapper.tsx
deleted file mode 100644
index 1654affec3a..00000000000
--- a/frontend/packages/ux-editor/src/components/Elements/Subform/SubformWrapper.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { LayoutSets } from 'app-shared/types/api/LayoutSetsResponse';
-import React from 'react';
-import { CreateSubformWrapper } from './CreateSubformWrapper';
-import { DeleteSubformWrapper } from './DeleteSubformWrapper';
-
-type SubformWrapperProps = {
-  layoutSets: LayoutSets;
-  onSubformCreated: (layoutSetName: string) => void;
-  selectedLayoutSet: string;
-};
-
-export const SubformWrapper = ({
-  layoutSets,
-  onSubformCreated,
-  selectedLayoutSet,
-}: SubformWrapperProps): React.ReactElement => {
-  return (
-    <div>
-      <CreateSubformWrapper layoutSets={layoutSets} onSubformCreated={onSubformCreated} />
-      <DeleteSubformWrapper layoutSets={layoutSets} selectedLayoutSet={selectedLayoutSet} />
-    </div>
-  );
-};
diff --git a/frontend/packages/ux-editor/src/components/config/Expressions/utils/utils.ts b/frontend/packages/ux-editor/src/components/config/Expressions/utils/utils.ts
index fb78014ef42..2cbe6c93c21 100644
--- a/frontend/packages/ux-editor/src/components/config/Expressions/utils/utils.ts
+++ b/frontend/packages/ux-editor/src/components/config/Expressions/utils/utils.ts
@@ -18,7 +18,6 @@ export const expressionPropertiesOnFormItem = <T extends ComponentType>(
     case ComponentType.FileUploadWithTag:
     case ComponentType.Input:
     case ComponentType.Likert:
-    case ComponentType.LikertItem:
     case ComponentType.List:
     case ComponentType.Map:
     case ComponentType.MultipleSelect:
diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditImage/LocalImage/ImportImage/AddImageFromLibrary/ChooseFromLibrary/ImageLibraryPreview.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditImage/LocalImage/ImportImage/AddImageFromLibrary/ChooseFromLibrary/ImageLibraryPreview.tsx
index 128e770e336..9f6e6391824 100644
--- a/frontend/packages/ux-editor/src/components/config/editModal/EditImage/LocalImage/ImportImage/AddImageFromLibrary/ChooseFromLibrary/ImageLibraryPreview.tsx
+++ b/frontend/packages/ux-editor/src/components/config/editModal/EditImage/LocalImage/ImportImage/AddImageFromLibrary/ChooseFromLibrary/ImageLibraryPreview.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import classes from './ChooseFromLibrary.module.css';
 import { imagePath } from 'app-shared/api/paths';
-import { extractFilename } from 'app-shared/utils/filenameUtils';
+import { FileNameUtils } from '@studio/pure-functions';
 import { useStudioEnvironmentParams } from 'app-shared/hooks/useStudioEnvironmentParams';
 import { WWWROOT_FILE_PATH } from '../../../../../EditImage/constants';
 import { StudioCard, StudioHeading } from '@studio/components';
@@ -42,6 +42,7 @@ const ImageFromLibrary = ({
   onAddImageReference,
   imageSource,
 }: ImageFromLibraryProps) => {
+  const fileName = FileNameUtils.extractFilename(imageFilePath);
   // The img component requires an alt which we can set to be the descriptions from the metadata in the library when this is available.
   // TODO: Add description when we know how to store them. See analysis issue: https://github.com/Altinn/altinn-studio/issues/13346
   return (
@@ -51,12 +52,8 @@ const ImageFromLibrary = ({
           <img src={imageSource} alt={imageFilePath} />
         </StudioCard.Media>
         <StudioCard.Header>
-          <StudioHeading
-            size='xs'
-            className={classes.fileName}
-            title={extractFilename(imageFilePath)}
-          >
-            {extractFilename(imageFilePath)}
+          <StudioHeading size='xs' className={classes.fileName} title={fileName}>
+            {fileName}
           </StudioHeading>
         </StudioCard.Header>
       </StudioCard>
diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditImage/LocalImage/PreviewImageSummary/PreviewFileInfo.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditImage/LocalImage/PreviewImageSummary/PreviewFileInfo.tsx
index 36be4f85699..5b7bf2ae8ca 100644
--- a/frontend/packages/ux-editor/src/components/config/editModal/EditImage/LocalImage/PreviewImageSummary/PreviewFileInfo.tsx
+++ b/frontend/packages/ux-editor/src/components/config/editModal/EditImage/LocalImage/PreviewImageSummary/PreviewFileInfo.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import classes from './PreviewFileInfo.module.css';
 import { StudioParagraph } from '@studio/components';
-import { extractFilename } from 'app-shared/utils/filenameUtils';
+import { FileNameUtils } from '@studio/pure-functions';
 
 interface PreviewFileInfoProps {
   existingImageUrl: string;
@@ -11,7 +11,7 @@ export const PreviewFileInfo = ({ existingImageUrl }: PreviewFileInfoProps) => {
   return (
     <div className={classes.fileInfoContainer}>
       <StudioParagraph size='small' className={classes.fileName} title={existingImageUrl}>
-        {extractFilename(existingImageUrl)}
+        {FileNameUtils.extractFilename(existingImageUrl)}
       </StudioParagraph>
     </div>
   );
diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/EditOptionList.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/EditOptionList.tsx
index 79dbde88e34..101659260be 100644
--- a/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/EditOptionList.tsx
+++ b/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/EditOptionList.tsx
@@ -9,7 +9,7 @@ import { altinnDocsUrl } from 'app-shared/ext-urls';
 import { FormField } from '../../../../../FormField';
 import { useStudioEnvironmentParams } from 'app-shared/hooks/useStudioEnvironmentParams';
 import type { SelectionComponentType } from '../../../../../../types/FormComponent';
-import { removeExtension } from 'app-shared/utils/filenameUtils';
+import { FileNameUtils } from '@studio/pure-functions';
 import { findFileNameError } from './utils/findFileNameError';
 import type { FileNameError } from './utils/findFileNameError';
 import type { AxiosError } from 'axios';
@@ -53,7 +53,7 @@ export function EditOptionList<T extends SelectionComponentType>({
   const handleUpload = (file: File) => {
     uploadOptionList(file, {
       onSuccess: () => {
-        handleOptionsIdChange(removeExtension(file.name));
+        handleOptionsIdChange(FileNameUtils.removeExtension(file.name));
         toast.success(t('ux_editor.modal_properties_code_list_upload_success'));
       },
       onError: (error: AxiosError<ApiError>) => {
diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/OptionListEditor.test.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/OptionListEditor.test.tsx
index 8bab0d67476..66cd525659f 100644
--- a/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/OptionListEditor.test.tsx
+++ b/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/OptionListEditor.test.tsx
@@ -7,11 +7,14 @@ import { textMock } from '@studio/testing/mocks/i18nMock';
 import { renderWithProviders } from '../../../../../../testing/mocks';
 import userEvent, { type UserEvent } from '@testing-library/user-event';
 import { createQueryClientMock } from 'app-shared/mocks/queryClientMock';
-import { queriesMock } from 'app-shared/mocks/queriesMock';
 import { app, org } from '@studio/testing/testids';
 
 // Test data:
 const mockComponentOptionsId = 'options';
+const getOptionLists = jest.fn().mockImplementation(() => Promise.resolve<OptionsLists>(apiResult));
+const updateOptionList = jest
+  .fn()
+  .mockImplementation(() => Promise.resolve<Option[]>([{ value: '', label: '' }]));
 
 const apiResult: OptionsLists = {
   options: [
@@ -22,9 +25,7 @@ const apiResult: OptionsLists = {
 };
 
 describe('OptionListEditor', () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
+  afterEach(jest.clearAllMocks);
 
   it('should render a spinner when there is no data', () => {
     renderOptionListEditor({
@@ -110,8 +111,8 @@ describe('OptionListEditor', () => {
     });
     await user.type(textBox, 'test');
 
-    await waitFor(() => expect(queriesMock.updateOptionList).toHaveBeenCalledTimes(1));
-    expect(queriesMock.updateOptionList).toHaveBeenCalledWith(
+    await waitFor(() => expect(updateOptionList).toHaveBeenCalledTimes(1));
+    expect(updateOptionList).toHaveBeenCalledWith(
       org,
       app,
       mockComponentOptionsId,
@@ -129,10 +130,7 @@ const openModal = async (user: UserEvent) => {
 
 const renderOptionListEditor = ({ previewContextProps = {}, queries = {} } = {}) => {
   return renderWithProviders(<OptionListEditor optionsId={mockComponentOptionsId} />, {
-    queries: {
-      getOptionLists: jest.fn().mockImplementation(() => Promise.resolve<OptionsLists>(apiResult)),
-      ...queries,
-    },
+    queries: { getOptionLists, updateOptionList, ...queries },
     queryClient: createQueryClientMock(),
     previewContextProps,
   });
@@ -140,9 +138,7 @@ const renderOptionListEditor = ({ previewContextProps = {}, queries = {} } = {})
 
 const renderOptionListEditorAndWaitForSpinnerToBeRemoved = async ({
   previewContextProps = {},
-  queries = {
-    getOptionLists: jest.fn().mockImplementation(() => Promise.resolve<OptionsLists>(apiResult)),
-  },
+  queries = {},
 } = {}) => {
   const view = renderOptionListEditor({ previewContextProps, queries });
   await waitForElementToBeRemoved(() => {
diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/utils/findFileNameError.ts b/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/utils/findFileNameError.ts
index 307307991a0..f13182f7336 100644
--- a/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/utils/findFileNameError.ts
+++ b/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditOptionList/utils/findFileNameError.ts
@@ -1,4 +1,4 @@
-import { removeExtension } from 'app-shared/utils/filenameUtils';
+import { FileNameUtils } from '@studio/pure-functions';
 
 export type FileNameError = 'invalidFileName' | 'fileExists';
 
@@ -6,7 +6,7 @@ export const findFileNameError = (
   optionListIds: string[],
   fileName: string,
 ): FileNameError | null => {
-  const fileNameWithoutExtension = removeExtension(fileName);
+  const fileNameWithoutExtension = FileNameUtils.removeExtension(fileName);
 
   if (!isFilenameValid(fileNameWithoutExtension)) {
     return 'invalidFileName';
diff --git a/frontend/packages/ux-editor/src/data/formItemConfig.ts b/frontend/packages/ux-editor/src/data/formItemConfig.ts
index c55b1edb32a..11cfd67c746 100644
--- a/frontend/packages/ux-editor/src/data/formItemConfig.ts
+++ b/frontend/packages/ux-editor/src/data/formItemConfig.ts
@@ -333,17 +333,6 @@ export const formItemConfigs: FormItemConfigs = {
     propertyPath: 'definitions/radioAndCheckboxComponents',
     icon: LikertIcon,
   },
-  [ComponentType.LikertItem]: {
-    name: ComponentType.LikertItem,
-    itemType: LayoutItemType.Component,
-    defaultProperties: {
-      dataModelBindings: {
-        simpleBinding: '',
-      },
-    },
-    propertyPath: 'definitions/radioAndCheckboxComponents',
-    icon: LikertIcon,
-  },
   [ComponentType.Link]: {
     name: ComponentType.Link,
     itemType: LayoutItemType.Component,
@@ -533,7 +522,6 @@ export const schemaComponents: FormItemConfigs[ComponentType][] = [
   formItemConfigs[ComponentType.Dropdown],
   formItemConfigs[ComponentType.MultipleSelect],
   formItemConfigs[ComponentType.Likert],
-  formItemConfigs[ComponentType.LikertItem],
   formItemConfigs[ComponentType.Datepicker],
   formItemConfigs[ComponentType.FileUpload],
   formItemConfigs[ComponentType.FileUploadWithTag],
diff --git a/frontend/packages/ux-editor/src/hooks/useValidDataModels.ts b/frontend/packages/ux-editor/src/hooks/useValidDataModels.ts
index 1bb5717757b..8e2b05c6665 100644
--- a/frontend/packages/ux-editor/src/hooks/useValidDataModels.ts
+++ b/frontend/packages/ux-editor/src/hooks/useValidDataModels.ts
@@ -22,7 +22,7 @@ export const useValidDataModels = (currentDataModel: string) => {
         org,
         app,
         layoutSetName: selectedFormLayoutSetName,
-        dataModelName: isDataModelValid ? currentDataModel : '',
+        dataModelName: isDataModelValid && currentDataModel ? currentDataModel : dataModels?.[0],
       },
       { enabled: !isPendingDataModels && !isFetchingDataModels },
     );
diff --git a/frontend/packages/ux-editor/src/testing/componentSchemaMocks.ts b/frontend/packages/ux-editor/src/testing/componentSchemaMocks.ts
index 3fd45f481e1..8db5480c7b5 100644
--- a/frontend/packages/ux-editor/src/testing/componentSchemaMocks.ts
+++ b/frontend/packages/ux-editor/src/testing/componentSchemaMocks.ts
@@ -22,7 +22,6 @@ import InputSchema from './schemas/json/component/Input.schema.v1.json';
 import InstanceInformationSchema from './schemas/json/component/InstanceInformation.schema.v1.json';
 import InstantiationButtonSchema from './schemas/json/component/InstantiationButton.schema.v1.json';
 import LikertSchema from './schemas/json/component/Likert.schema.v1.json';
-import LikertItemSchema from './schemas/json/component/LikertItem.schema.v1.json';
 import LinkSchema from './schemas/json/component/Link.schema.v1.json';
 import ListSchema from './schemas/json/component/List.schema.v1.json';
 import MapSchema from './schemas/json/component/Map.schema.v1.json';
@@ -68,7 +67,6 @@ export const componentSchemaMocks: Record<ComponentType, JsonSchema> = {
   [ComponentType.InstanceInformation]: InstanceInformationSchema,
   [ComponentType.InstantiationButton]: InstantiationButtonSchema,
   [ComponentType.Likert]: LikertSchema,
-  [ComponentType.LikertItem]: LikertItemSchema,
   [ComponentType.Link]: LinkSchema,
   [ComponentType.List]: ListSchema,
   [ComponentType.Map]: MapSchema,
diff --git a/frontend/packages/ux-editor/src/testing/schemas/json/component/LikertItem.schema.v1.json b/frontend/packages/ux-editor/src/testing/schemas/json/component/LikertItem.schema.v1.json
deleted file mode 100644
index dddb7c22ae5..00000000000
--- a/frontend/packages/ux-editor/src/testing/schemas/json/component/LikertItem.schema.v1.json
+++ /dev/null
@@ -1,265 +0,0 @@
-{
-  "$id": "https://altinncdn.no/schemas/json/component/LikertItem.schema.v1.json",
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "properties": {
-    "id": {
-      "title": "ID",
-      "description": "The component ID. Must be unique within all layouts/pages in a layout-set. Cannot end with <dash><number>.",
-      "type": "string",
-      "pattern": "^[0-9a-zA-Z][0-9a-zA-Z-]*(-?[a-zA-Z]+|[a-zA-Z][0-9]+|-[0-9]{6,})$"
-    },
-    "hidden": {
-      "title": "Hidden",
-      "description": "Boolean value or expression indicating if the component should be hidden. Defaults to false.",
-      "default": false,
-      "$ref": "expression.schema.v1.json#/definitions/boolean"
-    },
-    "grid": {
-      "properties": {
-        "xs": { "$ref": "#/definitions/IGridSize" },
-        "sm": { "$ref": "#/definitions/IGridSize" },
-        "md": { "$ref": "#/definitions/IGridSize" },
-        "lg": { "$ref": "#/definitions/IGridSize" },
-        "xl": { "$ref": "#/definitions/IGridSize" },
-        "labelGrid": { "$ref": "#/definitions/IGridStyling" },
-        "innerGrid": { "$ref": "#/definitions/IGridStyling" }
-      }
-    },
-    "pageBreak": {
-      "title": "Page break",
-      "description": "Optionally insert page-break before/after component when rendered in PDF",
-      "type": "object",
-      "properties": {
-        "breakBefore": {
-          "title": "Page break before",
-          "description": "PDF only: Value or expression indicating whether a page break should be added before the component. Can be either: 'auto' (default), 'always', or 'avoid'.",
-          "examples": ["auto", "always", "avoid"],
-          "default": "auto",
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        },
-        "breakAfter": {
-          "title": "Page break after",
-          "description": "PDF only: Value or expression indicating whether a page break should be added after the component. Can be either: 'auto' (default), 'always', or 'avoid'.",
-          "examples": ["auto", "always", "avoid"],
-          "default": "auto",
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        }
-      },
-      "additionalProperties": false
-    },
-    "readOnly": {
-      "title": "Read only/disabled?",
-      "description": "Boolean value or expression indicating if the component should be read only/disabled. Defaults to false. <br /> <i>Please note that even with read-only fields in components, it may currently be possible to update the field by modifying the request sent to the API or through a direct API call.<i/>",
-      "default": false,
-      "$ref": "expression.schema.v1.json#/definitions/boolean"
-    },
-    "required": {
-      "title": "Required?",
-      "description": "Boolean value or expression indicating if the component should be required. Defaults to false.",
-      "default": false,
-      "$ref": "expression.schema.v1.json#/definitions/boolean"
-    },
-    "showValidations": {
-      "title": "Validation types",
-      "description": "List of validation types to show",
-      "type": "array",
-      "items": {
-        "enum": [
-          "Schema",
-          "Component",
-          "Expression",
-          "CustomBackend",
-          "Required",
-          "AllExceptRequired",
-          "All"
-        ],
-        "type": "string"
-      }
-    },
-    "renderAsSummary": {
-      "title": "Render as summary",
-      "description": "Boolean value indicating if the component should be rendered as a summary. Defaults to false.",
-      "default": false,
-      "type": "boolean"
-    },
-    "forceShowInSummary": {
-      "title": "Force show in summary",
-      "description": "Will force show the component in a summary even if hideEmptyFields is set to true in the summary component.",
-      "default": false,
-      "$ref": "expression.schema.v1.json#/definitions/boolean"
-    },
-    "optionsId": {
-      "title": "Dynamic options (fetched from server)",
-      "description": "ID of the option list to fetch from the server",
-      "type": "string"
-    },
-    "mapping": {
-      "title": "Mapping",
-      "description": "A mapping of key-value pairs (usually used for mapping a path in the data model to a query string parameter).",
-      "type": "object",
-      "properties": {},
-      "additionalProperties": { "type": "string" }
-    },
-    "queryParameters": {
-      "title": "Query parameters",
-      "description": "A mapping of query string parameters to values. Will be appended to the URL when fetching options.",
-      "type": "object",
-      "properties": {},
-      "additionalProperties": { "type": "string" }
-    },
-    "options": {
-      "title": "Static options",
-      "description": "List of static options",
-      "type": "array",
-      "items": {
-        "title": "IRawOption",
-        "examples": [{ "label": "", "value": "" }],
-        "type": "object",
-        "properties": {
-          "label": { "type": "string" },
-          "value": {
-            "anyOf": [
-              { "type": "string" },
-              { "type": "number" },
-              { "type": "boolean" },
-              { "const": null }
-            ]
-          },
-          "description": { "type": "string" },
-          "helpText": { "type": "string" }
-        },
-        "required": ["label", "value"],
-        "additionalProperties": false
-      }
-    },
-    "secure": {
-      "title": "Secure options (when using optionsId)",
-      "description": "Whether to call the secure API endpoint when fetching options from the server (allows for user/instance-specific options)",
-      "default": false,
-      "type": "boolean"
-    },
-    "sortOrder": {
-      "description": "Sorts the code list in either ascending or descending order by label.",
-      "enum": ["asc", "desc"],
-      "type": "string"
-    },
-    "source": {
-      "title": "Option source",
-      "description": "Allows for fetching options from the data model, pointing to a repeating group structure",
-      "type": "object",
-      "properties": {
-        "group": {
-          "title": "Group",
-          "description": "The repeating group to base options on.",
-          "examples": ["model.some.group"],
-          "type": "string"
-        },
-        "label": {
-          "title": "Label",
-          "description": "A label of the option displayed in Radio- and Checkbox groups. Can be plain text, a text resource binding, or a dynamic expression.",
-          "examples": ["some.text.key"],
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        },
-        "value": {
-          "title": "Value",
-          "description": "Field in the group that should be used as value",
-          "examples": ["model.some.group[{0}].someField"],
-          "type": "string"
-        },
-        "description": {
-          "title": "Description",
-          "description": "A description of the option displayed in Radio- and Checkbox groups. Can be plain text, a text resource binding, or a dynamic expression.",
-          "examples": ["some.text.key", "My Description"],
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        },
-        "helpText": {
-          "title": "Help Text",
-          "description": "A help text for the option displayed in Radio- and Checkbox groups. Can be plain text, a text resource binding, or a dynamic expression.",
-          "examples": ["some.text.key", "My Help Text"],
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        }
-      },
-      "required": ["group", "label", "value"],
-      "additionalProperties": false
-    },
-    "preselectedOptionIndex": {
-      "title": "Preselected option index",
-      "description": "Index of the option to preselect (if no option has been selected yet)",
-      "type": "integer"
-    },
-    "type": { "const": "LikertItem" },
-    "textResourceBindings": {
-      "properties": {
-        "title": {
-          "title": "Title",
-          "description": "Title of the Likert component/row",
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        },
-        "description": {
-          "title": "Description",
-          "description": "Description of the Likert component/row",
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        },
-        "help": {
-          "title": "Help",
-          "description": "Help text of the Likert component/row",
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        },
-        "tableTitle": {
-          "title": "Table title",
-          "description": "Title used in the table view (overrides the default title)",
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        },
-        "shortName": {
-          "title": "Short name (for validation)",
-          "description": "Alternative name used for required validation messages (overrides the default title)",
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        },
-        "requiredValidation": {
-          "title": "Required validation message",
-          "description": "Full validation message shown when the component is required and no value has been entered (overrides both the default and shortName)",
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        },
-        "summaryTitle": {
-          "title": "Summary title",
-          "description": "Title used in the summary view (overrides the default title)",
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        },
-        "summaryAccessibleTitle": {
-          "title": "Accessible summary title",
-          "description": "Title used for aria-label on the edit button in the summary view (overrides the default and summary title)",
-          "$ref": "expression.schema.v1.json#/definitions/string"
-        }
-      }
-    },
-    "dataModelBindings": {
-      "title": "Data model binding",
-      "description": "Describes the location in the data model where the component should store its value(s). A simple binding is used for components that only store a single value, usually a string.",
-      "type": "object",
-      "properties": {
-        "simpleBinding": { "type": "string" },
-        "label": { "type": "string" },
-        "metadata": {
-          "description": "Describes the location where metadata for the option based component should be stored in the datamodel.",
-          "type": "string"
-        }
-      },
-      "required": ["simpleBinding"],
-      "additionalProperties": false
-    },
-    "showLabelsInTable": {
-      "title": "Show label when single option in table",
-      "description": "Boolean value indicating if the label should be visible when only one option exists in table",
-      "default": false,
-      "type": "boolean"
-    },
-    "layout": {
-      "title": "Layout",
-      "description": "Define the layout style for the options",
-      "enum": ["column", "row", "table"],
-      "type": "string"
-    }
-  },
-  "required": ["id", "type", "dataModelBindings"],
-  "title": "LikertItem component schema"
-}
diff --git a/frontend/resourceadm/components/AccessListDetails/AccessListDetail.test.tsx b/frontend/resourceadm/components/AccessListDetails/AccessListDetail.test.tsx
index fece855eee9..b5dbeededff 100644
--- a/frontend/resourceadm/components/AccessListDetails/AccessListDetail.test.tsx
+++ b/frontend/resourceadm/components/AccessListDetails/AccessListDetail.test.tsx
@@ -150,6 +150,16 @@ describe('AccessListDetail', () => {
       screen.queryByText(textMock('resourceadm.listadmin_delete_list_header')),
     ).not.toBeInTheDocument();
   });
+
+  it('should call back on back click', async () => {
+    const user = userEvent.setup();
+    renderAccessListDetail();
+
+    const backLink = screen.getByRole('link', { name: textMock('general.back') });
+    await user.click(backLink);
+
+    expect(mockedNavigate).toHaveBeenCalledWith('/listadmin');
+  });
 });
 
 const renderAccessListDetail = (
diff --git a/frontend/resourceadm/components/AccessListDetails/AccessListDetail.tsx b/frontend/resourceadm/components/AccessListDetails/AccessListDetail.tsx
index f9604f8912d..ab34d00e33a 100644
--- a/frontend/resourceadm/components/AccessListDetails/AccessListDetail.tsx
+++ b/frontend/resourceadm/components/AccessListDetails/AccessListDetail.tsx
@@ -1,8 +1,8 @@
 import React, { useRef, useState } from 'react';
-import { useNavigate, Link } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { toast } from 'react-toastify';
-import { Textfield, Heading, Link as DigdirLink } from '@digdir/designsystemet-react';
+import { Textfield, Heading } from '@digdir/designsystemet-react';
 import classes from './AccessListDetail.module.css';
 import type { AccessList, ResourceError } from 'app-shared/types/ResourceAdm';
 import { FieldWrapper } from '../FieldWrapper';
@@ -10,7 +10,7 @@ import { useEditAccessListMutation } from '../../hooks/mutations/useEditAccessLi
 import { useDeleteAccessListMutation } from '../../hooks/mutations/useDeleteAccessListMutation';
 import { AccessListMembers } from '../AccessListMembers';
 import { TrashIcon } from '@studio/icons';
-import { StudioButton, StudioModal } from '@studio/components';
+import { StudioButton, StudioLink, StudioModal } from '@studio/components';
 import { ServerCodes } from 'app-shared/enums/ServerCodes';
 import { AccessListPreconditionFailedToast } from '../AccessListPreconditionFailedToast';
 
@@ -81,6 +81,11 @@ export const AccessListDetail = ({
     deleteWarningModalRef.current?.close();
   };
 
+  const handleBackClick = (event: React.MouseEvent<HTMLAnchorElement>): void => {
+    event.preventDefault();
+    navigate(backUrl);
+  };
+
   return (
     <div className={classes.accessListDetailWrapper}>
       <StudioModal.Root>
@@ -104,9 +109,9 @@ export const AccessListDetail = ({
         </StudioModal.Dialog>
       </StudioModal.Root>
       <div>
-        <DigdirLink asChild>
-          <Link to={backUrl}>{t('general.back')}</Link>
-        </DigdirLink>
+        <StudioLink href={backUrl} onClick={handleBackClick}>
+          {t('general.back')}
+        </StudioLink>
       </div>
       <Heading level={1} size='large'>
         {t('resourceadm.listadmin_list_detail_header')}
diff --git a/frontend/resourceadm/components/LeftNavigationBar/GoBackButton/GoBackButton.tsx b/frontend/resourceadm/components/LeftNavigationBar/GoBackButton/GoBackButton.tsx
index 5632702119f..1c86417a303 100644
--- a/frontend/resourceadm/components/LeftNavigationBar/GoBackButton/GoBackButton.tsx
+++ b/frontend/resourceadm/components/LeftNavigationBar/GoBackButton/GoBackButton.tsx
@@ -42,8 +42,8 @@ export const GoBackButton = ({ className, text, to }: GoBackButtonProps): ReactN
   return (
     <NavLink className={cn(className, classes.backButton)} to={to}>
       <ArrowLeftIcon className={classes.icon} />
-      <Paragraph asChild size='small' variant='short' className={classes.buttonText}>
-        <span>{text}</span>
+      <Paragraph size='small' variant='short' className={classes.buttonText}>
+        {text}
       </Paragraph>
     </NavLink>
   );
diff --git a/frontend/resourceadm/components/LeftNavigationBar/Tab/Tab.tsx b/frontend/resourceadm/components/LeftNavigationBar/Tab/Tab.tsx
index bae7884b52b..aa70fd908d1 100644
--- a/frontend/resourceadm/components/LeftNavigationBar/Tab/Tab.tsx
+++ b/frontend/resourceadm/components/LeftNavigationBar/Tab/Tab.tsx
@@ -55,8 +55,8 @@ export const Tab = ({
       onKeyDown={onKeyDown}
     >
       {tab.icon}
-      <Paragraph asChild size='small' variant='short' className={classes.buttonText}>
-        <span>{t(tab.tabName)}</span>
+      <Paragraph size='small' variant='short' className={classes.buttonText}>
+        {t(tab.tabName)}
       </Paragraph>
     </TabContent>
   );
diff --git a/frontend/resourceadm/components/LinkButton/LinkButton.module.css b/frontend/resourceadm/components/LinkButton/LinkButton.module.css
deleted file mode 100644
index fbe658e8e2c..00000000000
--- a/frontend/resourceadm/components/LinkButton/LinkButton.module.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.linkButton {
-  background-color: inherit;
-  border: none;
-  font-size: inherit;
-  font-family: inherit;
-  font-weight: inherit;
-  padding: 0;
-}
diff --git a/frontend/resourceadm/components/LinkButton/LinkButton.test.tsx b/frontend/resourceadm/components/LinkButton/LinkButton.test.tsx
index 048baac7520..4507e73fb34 100644
--- a/frontend/resourceadm/components/LinkButton/LinkButton.test.tsx
+++ b/frontend/resourceadm/components/LinkButton/LinkButton.test.tsx
@@ -8,6 +8,7 @@ describe('LinkButton', () => {
   const mockOnClick = jest.fn();
 
   const defaultProps: LinkButtonProps = {
+    page: 'about',
     onClick: mockOnClick,
     children: 'Click Me',
   };
@@ -16,7 +17,7 @@ describe('LinkButton', () => {
     const user = userEvent.setup();
     render(<LinkButton {...defaultProps} />);
 
-    const linkButton = screen.getByRole('button', { name: /click me/i });
+    const linkButton = screen.getByRole('link', { name: /click me/i });
     await user.click(linkButton);
 
     expect(mockOnClick).toHaveBeenCalled();
diff --git a/frontend/resourceadm/components/LinkButton/LinkButton.tsx b/frontend/resourceadm/components/LinkButton/LinkButton.tsx
index 65d6ee0a94c..0dc241eb5b5 100644
--- a/frontend/resourceadm/components/LinkButton/LinkButton.tsx
+++ b/frontend/resourceadm/components/LinkButton/LinkButton.tsx
@@ -1,14 +1,18 @@
 import type { ReactNode } from 'react';
 import React from 'react';
-import classes from './LinkButton.module.css';
-import { Link } from '@digdir/designsystemet-react';
+import type { NavigationBarPage } from '../../types/NavigationBarPage';
+import { StudioLink } from '@studio/components';
 
 export type LinkButtonProps = {
+  /**
+   * Page name
+   */
+  page: NavigationBarPage;
   /**
    * Function to handle the click of the link
    * @returns void
    */
-  onClick?: () => void;
+  onClick?: (page: NavigationBarPage) => void;
   /**
    * Children of the component
    */
@@ -29,10 +33,15 @@ export type LinkButtonProps = {
  *
  * @returns {React.JSX.Element} - The rendered component
  */
-export const LinkButton = ({ onClick, children }: LinkButtonProps): React.JSX.Element => {
+export const LinkButton = ({ page, onClick, children }: LinkButtonProps): React.JSX.Element => {
+  const handleButtonClick = (event: React.MouseEvent<HTMLAnchorElement>): void => {
+    event.preventDefault();
+    onClick(page);
+  };
+
   return (
-    <Link asChild className={classes.linkButton}>
-      <button onClick={onClick}>{children}</button>
-    </Link>
+    <StudioLink href={page} onClick={handleButtonClick}>
+      {children}
+    </StudioLink>
   );
 };
diff --git a/frontend/resourceadm/components/ResourceAccessLists/ResourceAccessLists.test.tsx b/frontend/resourceadm/components/ResourceAccessLists/ResourceAccessLists.test.tsx
index b4230c70750..eaa238fdd03 100644
--- a/frontend/resourceadm/components/ResourceAccessLists/ResourceAccessLists.test.tsx
+++ b/frontend/resourceadm/components/ResourceAccessLists/ResourceAccessLists.test.tsx
@@ -66,9 +66,11 @@ const defaultProps: ResourceAccessListsProps = {
 
 const checkListMock = jest.fn();
 const uncheckListMock = jest.fn();
+const mockedNavigate = jest.fn();
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockedNavigate,
   useParams: () => ({
     org: org,
   }),
@@ -199,6 +201,21 @@ describe('ResourceAccessLists', () => {
       ),
     ).toBeInTheDocument();
   });
+
+  it('should navigate back on back button click', async () => {
+    const user = userEvent.setup();
+
+    renderResourceAccessLists();
+
+    const spinnerTitle = screen.queryByText(textMock('resourceadm.loading_lists'));
+    await waitForElementToBeRemoved(spinnerTitle);
+
+    const backLink = screen.getByRole('link', { name: textMock('general.back') });
+    await user.click(backLink);
+
+    const expectedBackUrl = `/${org}/${org}-resources/resource/${resourceId}/about`;
+    expect(mockedNavigate).toHaveBeenCalledWith(expectedBackUrl);
+  });
 });
 
 const renderResourceAccessLists = (getResourceAccessListsMock?: jest.Mock) => {
diff --git a/frontend/resourceadm/components/ResourceAccessLists/ResourceAccessLists.tsx b/frontend/resourceadm/components/ResourceAccessLists/ResourceAccessLists.tsx
index 493ed4f7935..4278ab90cfe 100644
--- a/frontend/resourceadm/components/ResourceAccessLists/ResourceAccessLists.tsx
+++ b/frontend/resourceadm/components/ResourceAccessLists/ResourceAccessLists.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useState, useRef } from 'react';
-import { Link } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { Checkbox, Heading, Link as DigdirLink } from '@digdir/designsystemet-react';
+import { Checkbox, Heading } from '@digdir/designsystemet-react';
 import classes from './ResourceAccessLists.module.css';
-import { StudioSpinner, StudioButton } from '@studio/components';
+import { StudioSpinner, StudioButton, StudioLink } from '@studio/components';
 import { PencilWritingIcon, PlusIcon } from '@studio/icons';
 import { useGetResourceAccessListsQuery } from '../../hooks/queries/useGetResourceAccessListsQuery';
 import { useAddResourceAccessListMutation } from '../../hooks/mutations/useAddResourceAccessListMutation';
@@ -26,9 +26,11 @@ export const ResourceAccessLists = ({
   resourceData,
 }: ResourceAccessListsProps): React.JSX.Element => {
   const { t } = useTranslation();
+  const navigate = useNavigate();
 
   const { org, app } = useUrlParams();
   const createAccessListModalRef = useRef<HTMLDialogElement>(null);
+  const backUrl = getResourcePageURL(org, app, resourceData.identifier, 'about');
 
   const [selectedLists, setSelectedLists] = useState<string[]>([]);
 
@@ -72,6 +74,11 @@ export const ResourceAccessLists = ({
     setSelectedLists((old) => [...old, listItemId]);
   };
 
+  const handleBackClick = (event: React.MouseEvent<HTMLAnchorElement>): void => {
+    event.preventDefault();
+    navigate(backUrl);
+  };
+
   if (isLoadingAccessLists) {
     return <StudioSpinner showSpinnerTitle spinnerTitle={t('resourceadm.loading_lists')} />;
   }
@@ -94,11 +101,9 @@ export const ResourceAccessLists = ({
         )}/${env}/`}
         onClose={() => createAccessListModalRef.current?.close()}
       />
-      <DigdirLink asChild>
-        <Link to={getResourcePageURL(org, app, resourceData.identifier, 'about')}>
-          {t('general.back')}
-        </Link>
-      </DigdirLink>
+      <StudioLink href={backUrl} onClick={handleBackClick}>
+        {t('general.back')}
+      </StudioLink>
       <Heading level={1} size='large'>
         {t('resourceadm.listadmin_resource_header', {
           resourceTitle: resourceData.title.nb,
diff --git a/frontend/resourceadm/components/ResourceDeployStatus/ResourceDeployStatus.test.tsx b/frontend/resourceadm/components/ResourceDeployStatus/ResourceDeployStatus.test.tsx
index 2311645beb4..407185dd881 100644
--- a/frontend/resourceadm/components/ResourceDeployStatus/ResourceDeployStatus.test.tsx
+++ b/frontend/resourceadm/components/ResourceDeployStatus/ResourceDeployStatus.test.tsx
@@ -68,14 +68,10 @@ describe('ResourceDeployStatus', () => {
   it('renders error messages with links when error is an array', () => {
     render(<ResourceDeployStatus {...defaultProps} />);
 
-    const firstErrorMessageLink = screen.getByRole('button', {
-      name: textMock(mockDeployError1.message),
-    });
+    const firstErrorMessageLink = screen.getByText(textMock(mockDeployError1.message));
     expect(firstErrorMessageLink).toBeInTheDocument();
 
-    const secondErrorMessageLink = screen.getByRole('button', {
-      name: textMock(mockDeployError2.message),
-    });
+    const secondErrorMessageLink = screen.getByText(textMock(mockDeployError2.message));
 
     expect(secondErrorMessageLink).toBeInTheDocument();
   });
@@ -84,9 +80,7 @@ describe('ResourceDeployStatus', () => {
     const user = userEvent.setup();
     render(<ResourceDeployStatus {...defaultProps} />);
 
-    const linkButton = screen.getByRole('button', {
-      name: textMock(mockDeployError1.message),
-    });
+    const linkButton = screen.getByText(textMock(mockDeployError1.message));
 
     await user.click(linkButton);
 
diff --git a/frontend/resourceadm/components/ResourceDeployStatus/ResourceDeployStatus.tsx b/frontend/resourceadm/components/ResourceDeployStatus/ResourceDeployStatus.tsx
index 0b53158381a..871392559b1 100644
--- a/frontend/resourceadm/components/ResourceDeployStatus/ResourceDeployStatus.tsx
+++ b/frontend/resourceadm/components/ResourceDeployStatus/ResourceDeployStatus.tsx
@@ -63,7 +63,7 @@ export const ResourceDeployStatus = ({
             <ArrowRightIcon fontSize='1.5rem' />
             <Paragraph size='small' className={classes.text}>
               <Trans i18nKey={errorItem.message} values={{ num: errorItem.numberOfErrors }}>
-                <LinkButton onClick={() => onNavigateToPageWithError(errorItem.pageWithError)} />
+                <LinkButton onClick={onNavigateToPageWithError} page={errorItem.pageWithError} />
               </Trans>
             </Paragraph>
           </div>
diff --git a/frontend/resourceadm/pages/ListAdminPage/ListAdminPage.test.tsx b/frontend/resourceadm/pages/ListAdminPage/ListAdminPage.test.tsx
index 63c730f85d6..4fccf3c7e2f 100644
--- a/frontend/resourceadm/pages/ListAdminPage/ListAdminPage.test.tsx
+++ b/frontend/resourceadm/pages/ListAdminPage/ListAdminPage.test.tsx
@@ -137,6 +137,20 @@ describe('ListAdminPage', () => {
       ),
     ).toBeInTheDocument();
   });
+
+  it('should navigate back on back button click', async () => {
+    (useParams as jest.Mock).mockReturnValue({
+      org: 'ttd',
+    });
+
+    const user = userEvent.setup();
+    renderListAdminPage();
+
+    const backLink = screen.getByRole('link', { name: textMock('resourceadm.listadmin_back') });
+    await user.click(backLink);
+
+    expect(mockedNavigate).toHaveBeenCalledWith('/ttd/ttd-resources');
+  });
 });
 
 const renderListAdminPage = (isError?: boolean) => {
diff --git a/frontend/resourceadm/pages/ListAdminPage/ListAdminPage.tsx b/frontend/resourceadm/pages/ListAdminPage/ListAdminPage.tsx
index 1ab6bf10e60..df06aa7ccd1 100644
--- a/frontend/resourceadm/pages/ListAdminPage/ListAdminPage.tsx
+++ b/frontend/resourceadm/pages/ListAdminPage/ListAdminPage.tsx
@@ -1,8 +1,8 @@
 import React, { useRef, useEffect, useCallback } from 'react';
-import { Link, useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { Heading, Link as DigdirLink, ToggleGroup } from '@digdir/designsystemet-react';
-import { StudioSpinner, StudioButton } from '@studio/components';
+import { Heading, ToggleGroup } from '@digdir/designsystemet-react';
+import { StudioSpinner, StudioButton, StudioLink } from '@studio/components';
 import { PencilWritingIcon, PlusIcon } from '@studio/icons';
 import classes from './ListAdminPage.module.css';
 import { useGetAccessListsQuery } from '../../hooks/queries/useGetAccessListsQuery';
@@ -43,13 +43,18 @@ export const ListAdminPage = (): React.JSX.Element => {
     }
   }, [org, selectedEnv, navigateToListEnv]);
 
+  const handleBackClick = (event: React.MouseEvent<HTMLAnchorElement>): void => {
+    event.preventDefault();
+    navigate(getResourceDashboardURL(org, app));
+  };
+
   const createAccessListModalRef = useRef<HTMLDialogElement>(null);
 
   return (
     <div className={classes.listAdminPageWrapper}>
-      <DigdirLink asChild>
-        <Link to={getResourceDashboardURL(org, app)}>{t('resourceadm.listadmin_back')}</Link>
-      </DigdirLink>
+      <StudioLink href={getResourceDashboardURL(org, app)} onClick={handleBackClick}>
+        {t('resourceadm.listadmin_back')}
+      </StudioLink>
       <Heading level={1} size='large'>
         {t('resourceadm.listadmin_header')}
       </Heading>
diff --git a/package.json b/package.json
index 4c55e55fadb..6f0d117fa83 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@svgr/webpack": "8.1.0",
     "@swc/core": "1.7.26",
-    "@swc/jest": "0.2.36",
+    "@swc/jest": "0.2.37",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.5.0",
     "@testing-library/react": "16.0.1",
diff --git a/src/Altinn.Platform/Altinn.Platform.PDF/pom.xml b/src/Altinn.Platform/Altinn.Platform.PDF/pom.xml
index 955a25ab0ee..0be21402d69 100644
--- a/src/Altinn.Platform/Altinn.Platform.PDF/pom.xml
+++ b/src/Altinn.Platform/Altinn.Platform.PDF/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.5</version>
+    <version>3.3.6</version>
   </parent>
   <dependencies>
     <dependency>
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.14.1</version>
+      <version>1.14.2</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.34</version>
+      <version>1.18.36</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git "a/testdata/Model/CSharp/Gitea/Kursdomene_APIN\303\270kkel_M_2020-05-26_5702_34556_SERES.cs" "b/testdata/Model/CSharp/Gitea/Kursdomene_APIN\303\270kkel_M_2020-05-26_5702_34556_SERES.cs"
index 0e242fe8fa1..c9937762a9b 100644
--- "a/testdata/Model/CSharp/Gitea/Kursdomene_APIN\303\270kkel_M_2020-05-26_5702_34556_SERES.cs"
+++ "b/testdata/Model/CSharp/Gitea/Kursdomene_APIN\303\270kkel_M_2020-05-26_5702_34556_SERES.cs"
@@ -63,12 +63,12 @@ public class Applikasjon
     [JsonPropertyName("beskrivelse")]
     public string beskrivelse { get; set; }
 
-    [XmlElement("miljoe", Order = 6)]
+    [XmlElement("miljoe", Order = 6, IsNullable = true)]
     [JsonProperty("miljoe")]
     [JsonPropertyName("miljoe")]
     public string miljoe { get; set; }
 
-    [XmlElement("nettleserApplikasjonWebadresse", Order = 7)]
+    [XmlElement("nettleserApplikasjonWebadresse", Order = 7, IsNullable = true)]
     [JsonProperty("nettleserApplikasjonWebadresse")]
     [JsonPropertyName("nettleserApplikasjonWebadresse")]
     public string nettleserApplikasjonWebadresse { get; set; }
@@ -77,32 +77,32 @@ public class Applikasjon
 
   public class APIRessurs
   {
-    [XmlElement("profile", Order = 1)]
+    [XmlElement("profile", Order = 1, IsNullable = true)]
     [JsonProperty("profile")]
     [JsonPropertyName("profile")]
     public string profile { get; set; }
 
-    [XmlElement("organizationReportee", Order = 2)]
+    [XmlElement("organizationReportee", Order = 2, IsNullable = true)]
     [JsonProperty("organizationReportee")]
     [JsonPropertyName("organizationReportee")]
     public string organizationReportee { get; set; }
 
-    [XmlElement("meldingsboks", Order = 3)]
+    [XmlElement("meldingsboks", Order = 3, IsNullable = true)]
     [JsonProperty("meldingsboks")]
     [JsonPropertyName("meldingsboks")]
     public string meldingsboks { get; set; }
 
-    [XmlElement("lookup", Order = 4)]
+    [XmlElement("lookup", Order = 4, IsNullable = true)]
     [JsonProperty("lookup")]
     [JsonPropertyName("lookup")]
     public string lookup { get; set; }
 
-    [XmlElement("broker", Order = 5)]
+    [XmlElement("broker", Order = 5, IsNullable = true)]
     [JsonProperty("broker")]
     [JsonPropertyName("broker")]
     public string broker { get; set; }
 
-    [XmlElement("autorisasjon", Order = 6)]
+    [XmlElement("autorisasjon", Order = 6, IsNullable = true)]
     [JsonProperty("autorisasjon")]
     [JsonPropertyName("autorisasjon")]
     public string autorisasjon { get; set; }
diff --git a/testdata/Model/CSharp/Gitea/Kursdomene_BliTjenesteeier_M_2020-05-25_5703_34553_SERES.cs b/testdata/Model/CSharp/Gitea/Kursdomene_BliTjenesteeier_M_2020-05-25_5703_34553_SERES.cs
index 8555a471853..b839a3400ad 100644
--- a/testdata/Model/CSharp/Gitea/Kursdomene_BliTjenesteeier_M_2020-05-25_5703_34553_SERES.cs
+++ b/testdata/Model/CSharp/Gitea/Kursdomene_BliTjenesteeier_M_2020-05-25_5703_34553_SERES.cs
@@ -59,12 +59,12 @@ public class Tjenesteeier
     [JsonPropertyName("sektor")]
     public string sektor { get; set; }
 
-    [XmlElement("navnNynorsk", Order = 4)]
+    [XmlElement("navnNynorsk", Order = 4, IsNullable = true)]
     [JsonProperty("navnNynorsk")]
     [JsonPropertyName("navnNynorsk")]
     public string navnNynorsk { get; set; }
 
-    [XmlElement("navnEngelsk", Order = 5)]
+    [XmlElement("navnEngelsk", Order = 5, IsNullable = true)]
     [JsonProperty("navnEngelsk")]
     [JsonPropertyName("navnEngelsk")]
     public string navnEngelsk { get; set; }
diff --git a/testdata/Model/CSharp/Gitea/dat-skjema.cs b/testdata/Model/CSharp/Gitea/dat-skjema.cs
index e8717c0dbba..ce4ef534a7f 100644
--- a/testdata/Model/CSharp/Gitea/dat-skjema.cs
+++ b/testdata/Model/CSharp/Gitea/dat-skjema.cs
@@ -207,7 +207,7 @@ public class InnholdSkjema
     public bool? BekreftRiktig { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("AnsatteInnen", Order = 4)]
+    [XmlElement("AnsatteInnen", Order = 4, IsNullable = true)]
     [JsonProperty("AnsatteInnen")]
     [JsonPropertyName("AnsatteInnen")]
     public string AnsatteInnen { get; set; }
diff --git a/testdata/Model/CSharp/Gitea/nbib-melding.cs b/testdata/Model/CSharp/Gitea/nbib-melding.cs
index 34c0a137470..cd4516280bd 100644
--- a/testdata/Model/CSharp/Gitea/nbib-melding.cs
+++ b/testdata/Model/CSharp/Gitea/nbib-melding.cs
@@ -12,32 +12,32 @@ namespace Altinn.App.Models
   [XmlRoot(ElementName="Message")]
   public class MessageV1
   {
-    [XmlElement("ProcessTask", Order = 1)]
+    [XmlElement("ProcessTask", Order = 1, IsNullable = true)]
     [JsonProperty("ProcessTask")]
     [JsonPropertyName("ProcessTask")]
     public string ProcessTask { get; set; }
 
-    [XmlElement("ServiceName", Order = 2)]
+    [XmlElement("ServiceName", Order = 2, IsNullable = true)]
     [JsonProperty("ServiceName")]
     [JsonPropertyName("ServiceName")]
     public string ServiceName { get; set; }
 
-    [XmlElement("Title", Order = 3)]
+    [XmlElement("Title", Order = 3, IsNullable = true)]
     [JsonProperty("Title")]
     [JsonPropertyName("Title")]
     public string Title { get; set; }
 
-    [XmlElement("Body", Order = 4)]
+    [XmlElement("Body", Order = 4, IsNullable = true)]
     [JsonProperty("Body")]
     [JsonPropertyName("Body")]
     public string Body { get; set; }
 
-    [XmlElement("Reference", Order = 5)]
+    [XmlElement("Reference", Order = 5, IsNullable = true)]
     [JsonProperty("Reference")]
     [JsonPropertyName("Reference")]
     public string Reference { get; set; }
 
-    [XmlElement("Sender", Order = 6)]
+    [XmlElement("Sender", Order = 6, IsNullable = true)]
     [JsonProperty("Sender")]
     [JsonPropertyName("Sender")]
     public string Sender { get; set; }
diff --git a/testdata/Model/CSharp/Gitea/skjema.cs b/testdata/Model/CSharp/Gitea/skjema.cs
index 9b704c85b7f..5357c951b8c 100644
--- a/testdata/Model/CSharp/Gitea/skjema.cs
+++ b/testdata/Model/CSharp/Gitea/skjema.cs
@@ -331,7 +331,7 @@ public class InnholdSkjema
     public string SamfunnskritiskBransje { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("BenyttesFraDato", Order = 15)]
+    [XmlElement("BenyttesFraDato", Order = 15, IsNullable = true)]
     [JsonProperty("BenyttesFraDato")]
     [JsonPropertyName("BenyttesFraDato")]
     public string BenyttesFraDato { get; set; }
diff --git a/testdata/Model/CSharp/Gitea/srf-fufinn-behovsendring.cs b/testdata/Model/CSharp/Gitea/srf-fufinn-behovsendring.cs
index 3b7df713495..85955e6e01b 100644
--- a/testdata/Model/CSharp/Gitea/srf-fufinn-behovsendring.cs
+++ b/testdata/Model/CSharp/Gitea/srf-fufinn-behovsendring.cs
@@ -50,7 +50,7 @@ public class Felles
 
   public class InnsenderPerson
   {
-    [XmlElement("navn", Order = 1)]
+    [XmlElement("navn", Order = 1, IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
@@ -87,27 +87,27 @@ public class InnsenderPerson
 
   public class Adresse
   {
-    [XmlElement("adresse1", Order = 1)]
+    [XmlElement("adresse1", Order = 1, IsNullable = true)]
     [JsonProperty("adresse1")]
     [JsonPropertyName("adresse1")]
     public string adresse1 { get; set; }
 
-    [XmlElement("adresse2", Order = 2)]
+    [XmlElement("adresse2", Order = 2, IsNullable = true)]
     [JsonProperty("adresse2")]
     [JsonPropertyName("adresse2")]
     public string adresse2 { get; set; }
 
-    [XmlElement("postnummer", Order = 3)]
+    [XmlElement("postnummer", Order = 3, IsNullable = true)]
     [JsonProperty("postnummer")]
     [JsonPropertyName("postnummer")]
     public string postnummer { get; set; }
 
-    [XmlElement("poststed", Order = 4)]
+    [XmlElement("poststed", Order = 4, IsNullable = true)]
     [JsonProperty("poststed")]
     [JsonPropertyName("poststed")]
     public string poststed { get; set; }
 
-    [XmlElement("land", Order = 5)]
+    [XmlElement("land", Order = 5, IsNullable = true)]
     [JsonProperty("land")]
     [JsonPropertyName("land")]
     public string land { get; set; }
@@ -116,12 +116,12 @@ public class Adresse
 
   public class InnsenderOrganisasjon
   {
-    [XmlElement("kontaktperson", Order = 1)]
+    [XmlElement("kontaktperson", Order = 1, IsNullable = true)]
     [JsonProperty("kontaktperson")]
     [JsonPropertyName("kontaktperson")]
     public string kontaktperson { get; set; }
 
-    [XmlElement("organisasjonsnavn", Order = 2)]
+    [XmlElement("organisasjonsnavn", Order = 2, IsNullable = true)]
     [JsonProperty("organisasjonsnavn")]
     [JsonPropertyName("organisasjonsnavn")]
     public string organisasjonsnavn { get; set; }
@@ -158,7 +158,7 @@ public class InnsenderOrganisasjon
 
   public class HvemGjelderHenvendelsen
   {
-    [XmlElement("navn", Order = 1)]
+    [XmlElement("navn", Order = 1, IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
@@ -179,7 +179,7 @@ public class HvemGjelderHenvendelsen
 
   public class HvorSkalHenvendelsenSendes
   {
-    [XmlElement("fylke", Order = 1)]
+    [XmlElement("fylke", Order = 1, IsNullable = true)]
     [JsonProperty("fylke")]
     [JsonPropertyName("fylke")]
     public string fylke { get; set; }
@@ -188,7 +188,7 @@ public class HvorSkalHenvendelsenSendes
 
   public class SkjemaSpesifikt
   {
-    [XmlElement("andreBehov", Order = 1)]
+    [XmlElement("andreBehov", Order = 1, IsNullable = true)]
     [JsonProperty("andreBehov")]
     [JsonPropertyName("andreBehov")]
     public string andreBehov { get; set; }
@@ -283,12 +283,12 @@ public class SkjemaSpesifikt
     [JsonPropertyName("hjelpeapparat")]
     public Hjelpeapparat hjelpeapparat { get; set; }
 
-    [XmlElement("endringEllerNy", Order = 20)]
+    [XmlElement("endringEllerNy", Order = 20, IsNullable = true)]
     [JsonProperty("endringEllerNy")]
     [JsonPropertyName("endringEllerNy")]
     public string endringEllerNy { get; set; }
 
-    [XmlElement("innsenderRelasjon", Order = 21)]
+    [XmlElement("innsenderRelasjon", Order = 21, IsNullable = true)]
     [JsonProperty("innsenderRelasjon")]
     [JsonPropertyName("innsenderRelasjon")]
     public string innsenderRelasjon { get; set; }
@@ -297,12 +297,12 @@ public class SkjemaSpesifikt
 
   public class Bank
   {
-    [XmlElement("bankRepresentasjon", Order = 1)]
+    [XmlElement("bankRepresentasjon", Order = 1, IsNullable = true)]
     [JsonProperty("bankRepresentasjon")]
     [JsonPropertyName("bankRepresentasjon")]
     public string bankRepresentasjon { get; set; }
 
-    [XmlElement("bankLaan", Order = 2)]
+    [XmlElement("bankLaan", Order = 2, IsNullable = true)]
     [JsonProperty("bankLaan")]
     [JsonPropertyName("bankLaan")]
     public string bankLaan { get; set; }
@@ -311,7 +311,7 @@ public class Bank
 
   public class Forsikringsselskap
   {
-    [XmlElement("forsikringForvalte", Order = 1)]
+    [XmlElement("forsikringForvalte", Order = 1, IsNullable = true)]
     [JsonProperty("forsikringForvalte")]
     [JsonPropertyName("forsikringForvalte")]
     public string forsikringForvalte { get; set; }
@@ -320,12 +320,12 @@ public class Forsikringsselskap
 
   public class Helfo
   {
-    [XmlElement("helfoRefusjon", Order = 1)]
+    [XmlElement("helfoRefusjon", Order = 1, IsNullable = true)]
     [JsonProperty("helfoRefusjon")]
     [JsonPropertyName("helfoRefusjon")]
     public string helfoRefusjon { get; set; }
 
-    [XmlElement("helfoFastlege", Order = 2)]
+    [XmlElement("helfoFastlege", Order = 2, IsNullable = true)]
     [JsonProperty("helfoFastlege")]
     [JsonPropertyName("helfoFastlege")]
     public string helfoFastlege { get; set; }
@@ -334,12 +334,12 @@ public class Helfo
 
   public class Husbanken
   {
-    [XmlElement("husbankenBostoette", Order = 1)]
+    [XmlElement("husbankenBostoette", Order = 1, IsNullable = true)]
     [JsonProperty("husbankenBostoette")]
     [JsonPropertyName("husbankenBostoette")]
     public string husbankenBostoette { get; set; }
 
-    [XmlElement("husbankenStartlaan", Order = 2)]
+    [XmlElement("husbankenStartlaan", Order = 2, IsNullable = true)]
     [JsonProperty("husbankenStartlaan")]
     [JsonPropertyName("husbankenStartlaan")]
     public string husbankenStartlaan { get; set; }
@@ -348,7 +348,7 @@ public class Husbanken
 
   public class Inkassoselskap
   {
-    [XmlElement("inkasseForhandle", Order = 1)]
+    [XmlElement("inkasseForhandle", Order = 1, IsNullable = true)]
     [JsonProperty("inkasseForhandle")]
     [JsonPropertyName("inkasseForhandle")]
     public string inkasseForhandle { get; set; }
@@ -357,7 +357,7 @@ public class Inkassoselskap
 
   public class Innkreving
   {
-    [XmlElement("innkrevingGjeldsordning", Order = 1)]
+    [XmlElement("innkrevingGjeldsordning", Order = 1, IsNullable = true)]
     [JsonProperty("innkrevingGjeldsordning")]
     [JsonPropertyName("innkrevingGjeldsordning")]
     public string innkrevingGjeldsordning { get; set; }
@@ -366,37 +366,37 @@ public class Innkreving
 
   public class Kartverket
   {
-    [XmlElement("kartSalgEiendom", Order = 1)]
+    [XmlElement("kartSalgEiendom", Order = 1, IsNullable = true)]
     [JsonProperty("kartSalgEiendom")]
     [JsonPropertyName("kartSalgEiendom")]
     public string kartSalgEiendom { get; set; }
 
-    [XmlElement("kartKjoepEiendom", Order = 2)]
+    [XmlElement("kartKjoepEiendom", Order = 2, IsNullable = true)]
     [JsonProperty("kartKjoepEiendom")]
     [JsonPropertyName("kartKjoepEiendom")]
     public string kartKjoepEiendom { get; set; }
 
-    [XmlElement("kartArv", Order = 3)]
+    [XmlElement("kartArv", Order = 3, IsNullable = true)]
     [JsonProperty("kartArv")]
     [JsonPropertyName("kartArv")]
     public string kartArv { get; set; }
 
-    [XmlElement("kartEndreEiendom", Order = 4)]
+    [XmlElement("kartEndreEiendom", Order = 4, IsNullable = true)]
     [JsonProperty("kartEndreEiendom")]
     [JsonPropertyName("kartEndreEiendom")]
     public string kartEndreEiendom { get; set; }
 
-    [XmlElement("kartAvtaler", Order = 5)]
+    [XmlElement("kartAvtaler", Order = 5, IsNullable = true)]
     [JsonProperty("kartAvtaler")]
     [JsonPropertyName("kartAvtaler")]
     public string kartAvtaler { get; set; }
 
-    [XmlElement("kartSletting", Order = 6)]
+    [XmlElement("kartSletting", Order = 6, IsNullable = true)]
     [JsonProperty("kartSletting")]
     [JsonPropertyName("kartSletting")]
     public string kartSletting { get; set; }
 
-    [XmlElement("kartLaaneopptak", Order = 7)]
+    [XmlElement("kartLaaneopptak", Order = 7, IsNullable = true)]
     [JsonProperty("kartLaaneopptak")]
     [JsonPropertyName("kartLaaneopptak")]
     public string kartLaaneopptak { get; set; }
@@ -405,27 +405,27 @@ public class Kartverket
 
   public class Kommune
   {
-    [XmlElement("kommuneBygg", Order = 1)]
+    [XmlElement("kommuneBygg", Order = 1, IsNullable = true)]
     [JsonProperty("kommuneBygg")]
     [JsonPropertyName("kommuneBygg")]
     public string kommuneBygg { get; set; }
 
-    [XmlElement("kommuneHelse", Order = 2)]
+    [XmlElement("kommuneHelse", Order = 2, IsNullable = true)]
     [JsonProperty("kommuneHelse")]
     [JsonPropertyName("kommuneHelse")]
     public string kommuneHelse { get; set; }
 
-    [XmlElement("kommuneSosial", Order = 3)]
+    [XmlElement("kommuneSosial", Order = 3, IsNullable = true)]
     [JsonProperty("kommuneSosial")]
     [JsonPropertyName("kommuneSosial")]
     public string kommuneSosial { get; set; }
 
-    [XmlElement("kommuneSkole", Order = 4)]
+    [XmlElement("kommuneSkole", Order = 4, IsNullable = true)]
     [JsonProperty("kommuneSkole")]
     [JsonPropertyName("kommuneSkole")]
     public string kommuneSkole { get; set; }
 
-    [XmlElement("kommuneSkatt", Order = 5)]
+    [XmlElement("kommuneSkatt", Order = 5, IsNullable = true)]
     [JsonProperty("kommuneSkatt")]
     [JsonPropertyName("kommuneSkatt")]
     public string kommuneSkatt { get; set; }
@@ -434,7 +434,7 @@ public class Kommune
 
   public class Kredittvurderingsselskap
   {
-    [XmlElement("kredittKredittsperre", Order = 1)]
+    [XmlElement("kredittKredittsperre", Order = 1, IsNullable = true)]
     [JsonProperty("kredittKredittsperre")]
     [JsonPropertyName("kredittKredittsperre")]
     public string kredittKredittsperre { get; set; }
@@ -443,12 +443,12 @@ public class Kredittvurderingsselskap
 
   public class Namsmannen
   {
-    [XmlElement("namsmannenGjeldsordning", Order = 1)]
+    [XmlElement("namsmannenGjeldsordning", Order = 1, IsNullable = true)]
     [JsonProperty("namsmannenGjeldsordning")]
     [JsonPropertyName("namsmannenGjeldsordning")]
     public string namsmannenGjeldsordning { get; set; }
 
-    [XmlElement("namsmannenTvangsfullbyrdelse", Order = 2)]
+    [XmlElement("namsmannenTvangsfullbyrdelse", Order = 2, IsNullable = true)]
     [JsonProperty("namsmannenTvangsfullbyrdelse")]
     [JsonPropertyName("namsmannenTvangsfullbyrdelse")]
     public string namsmannenTvangsfullbyrdelse { get; set; }
@@ -457,27 +457,27 @@ public class Namsmannen
 
   public class Nav
   {
-    [XmlElement("navArbeid", Order = 1)]
+    [XmlElement("navArbeid", Order = 1, IsNullable = true)]
     [JsonProperty("navArbeid")]
     [JsonPropertyName("navArbeid")]
     public string navArbeid { get; set; }
 
-    [XmlElement("navFamilie", Order = 2)]
+    [XmlElement("navFamilie", Order = 2, IsNullable = true)]
     [JsonProperty("navFamilie")]
     [JsonPropertyName("navFamilie")]
     public string navFamilie { get; set; }
 
-    [XmlElement("navHjelpemidler", Order = 3)]
+    [XmlElement("navHjelpemidler", Order = 3, IsNullable = true)]
     [JsonProperty("navHjelpemidler")]
     [JsonPropertyName("navHjelpemidler")]
     public string navHjelpemidler { get; set; }
 
-    [XmlElement("navPensjon", Order = 4)]
+    [XmlElement("navPensjon", Order = 4, IsNullable = true)]
     [JsonProperty("navPensjon")]
     [JsonPropertyName("navPensjon")]
     public string navPensjon { get; set; }
 
-    [XmlElement("navSosial", Order = 5)]
+    [XmlElement("navSosial", Order = 5, IsNullable = true)]
     [JsonProperty("navSosial")]
     [JsonPropertyName("navSosial")]
     public string navSosial { get; set; }
@@ -486,7 +486,7 @@ public class Nav
 
   public class Pasientreiser
   {
-    [XmlElement("pasientRefusjon", Order = 1)]
+    [XmlElement("pasientRefusjon", Order = 1, IsNullable = true)]
     [JsonProperty("pasientRefusjon")]
     [JsonPropertyName("pasientRefusjon")]
     public string pasientRefusjon { get; set; }
@@ -495,22 +495,22 @@ public class Pasientreiser
 
   public class Skatteetaten
   {
-    [XmlElement("skattInnkreving", Order = 1)]
+    [XmlElement("skattInnkreving", Order = 1, IsNullable = true)]
     [JsonProperty("skattInnkreving")]
     [JsonPropertyName("skattInnkreving")]
     public string skattInnkreving { get; set; }
 
-    [XmlElement("skattPostadresse", Order = 2)]
+    [XmlElement("skattPostadresse", Order = 2, IsNullable = true)]
     [JsonProperty("skattPostadresse")]
     [JsonPropertyName("skattPostadresse")]
     public string skattPostadresse { get; set; }
 
-    [XmlElement("skattFlytting", Order = 3)]
+    [XmlElement("skattFlytting", Order = 3, IsNullable = true)]
     [JsonProperty("skattFlytting")]
     [JsonPropertyName("skattFlytting")]
     public string skattFlytting { get; set; }
 
-    [XmlElement("skattSkatt", Order = 4)]
+    [XmlElement("skattSkatt", Order = 4, IsNullable = true)]
     [JsonProperty("skattSkatt")]
     [JsonPropertyName("skattSkatt")]
     public string skattSkatt { get; set; }
@@ -519,17 +519,17 @@ public class Skatteetaten
 
   public class Tingretten
   {
-    [XmlElement("tingrettUskifte", Order = 1)]
+    [XmlElement("tingrettUskifte", Order = 1, IsNullable = true)]
     [JsonProperty("tingrettUskifte")]
     [JsonPropertyName("tingrettUskifte")]
     public string tingrettUskifte { get; set; }
 
-    [XmlElement("tingrettPrivatDoedsbo", Order = 2)]
+    [XmlElement("tingrettPrivatDoedsbo", Order = 2, IsNullable = true)]
     [JsonProperty("tingrettPrivatDoedsbo")]
     [JsonPropertyName("tingrettPrivatDoedsbo")]
     public string tingrettPrivatDoedsbo { get; set; }
 
-    [XmlElement("tingrettBegjaereDoedsbo", Order = 3)]
+    [XmlElement("tingrettBegjaereDoedsbo", Order = 3, IsNullable = true)]
     [JsonProperty("tingrettBegjaereDoedsbo")]
     [JsonPropertyName("tingrettBegjaereDoedsbo")]
     public string tingrettBegjaereDoedsbo { get; set; }
@@ -538,27 +538,27 @@ public class Tingretten
 
   public class OEvrige
   {
-    [XmlElement("oevrigeKjoepVarer", Order = 1)]
+    [XmlElement("oevrigeKjoepVarer", Order = 1, IsNullable = true)]
     [JsonProperty("oevrigeKjoepVarer")]
     [JsonPropertyName("oevrigeKjoepVarer")]
     public string oevrigeKjoepVarer { get; set; }
 
-    [XmlElement("oevrigeHusleiekontrakt", Order = 2)]
+    [XmlElement("oevrigeHusleiekontrakt", Order = 2, IsNullable = true)]
     [JsonProperty("oevrigeHusleiekontrakt")]
     [JsonPropertyName("oevrigeHusleiekontrakt")]
     public string oevrigeHusleiekontrakt { get; set; }
 
-    [XmlElement("oevrigeLoesoere", Order = 3)]
+    [XmlElement("oevrigeLoesoere", Order = 3, IsNullable = true)]
     [JsonProperty("oevrigeLoesoere")]
     [JsonPropertyName("oevrigeLoesoere")]
     public string oevrigeLoesoere { get; set; }
 
-    [XmlElement("oevrigeUtgifter", Order = 4)]
+    [XmlElement("oevrigeUtgifter", Order = 4, IsNullable = true)]
     [JsonProperty("oevrigeUtgifter")]
     [JsonPropertyName("oevrigeUtgifter")]
     public string oevrigeUtgifter { get; set; }
 
-    [XmlElement("oevrigeAvslutteHusleie", Order = 5)]
+    [XmlElement("oevrigeAvslutteHusleie", Order = 5, IsNullable = true)]
     [JsonProperty("oevrigeAvslutteHusleie")]
     [JsonPropertyName("oevrigeAvslutteHusleie")]
     public string oevrigeAvslutteHusleie { get; set; }
@@ -567,12 +567,12 @@ public class OEvrige
 
   public class Statsforvalter
   {
-    [XmlElement("statsforvalterTvangsvedtak", Order = 1)]
+    [XmlElement("statsforvalterTvangsvedtak", Order = 1, IsNullable = true)]
     [JsonProperty("statsforvalterTvangsvedtak")]
     [JsonPropertyName("statsforvalterTvangsvedtak")]
     public string statsforvalterTvangsvedtak { get; set; }
 
-    [XmlElement("statsforvalterSamtykke", Order = 2)]
+    [XmlElement("statsforvalterSamtykke", Order = 2, IsNullable = true)]
     [JsonProperty("statsforvalterSamtykke")]
     [JsonPropertyName("statsforvalterSamtykke")]
     public string statsforvalterSamtykke { get; set; }
@@ -581,22 +581,22 @@ public class Statsforvalter
 
   public class Vergehaver
   {
-    [XmlElement("telefonsamtaleMulig", Order = 1)]
+    [XmlElement("telefonsamtaleMulig", Order = 1, IsNullable = true)]
     [JsonProperty("telefonsamtaleMulig")]
     [JsonPropertyName("telefonsamtaleMulig")]
     public string telefonsamtaleMulig { get; set; }
 
-    [XmlElement("telefonsamtaleHvorfor", Order = 2)]
+    [XmlElement("telefonsamtaleHvorfor", Order = 2, IsNullable = true)]
     [JsonProperty("telefonsamtaleHvorfor")]
     [JsonPropertyName("telefonsamtaleHvorfor")]
     public string telefonsamtaleHvorfor { get; set; }
 
-    [XmlElement("borPaaInstitusjon", Order = 3)]
+    [XmlElement("borPaaInstitusjon", Order = 3, IsNullable = true)]
     [JsonProperty("borPaaInstitusjon")]
     [JsonPropertyName("borPaaInstitusjon")]
     public string borPaaInstitusjon { get; set; }
 
-    [XmlElement("hvilkenInstitusjon", Order = 4)]
+    [XmlElement("hvilkenInstitusjon", Order = 4, IsNullable = true)]
     [JsonProperty("hvilkenInstitusjon")]
     [JsonPropertyName("hvilkenInstitusjon")]
     public string hvilkenInstitusjon { get; set; }
@@ -622,7 +622,7 @@ public class Hjelpeapparat
     [JsonPropertyName("telefonnummer")]
     public string telefonnummer { get; set; }
 
-    [XmlElement("navn", Order = 2)]
+    [XmlElement("navn", Order = 2, IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
diff --git a/testdata/Model/CSharp/Gitea/srf-fufinn-behovskartleggin.cs b/testdata/Model/CSharp/Gitea/srf-fufinn-behovskartleggin.cs
index 3b7df713495..85955e6e01b 100644
--- a/testdata/Model/CSharp/Gitea/srf-fufinn-behovskartleggin.cs
+++ b/testdata/Model/CSharp/Gitea/srf-fufinn-behovskartleggin.cs
@@ -50,7 +50,7 @@ public class Felles
 
   public class InnsenderPerson
   {
-    [XmlElement("navn", Order = 1)]
+    [XmlElement("navn", Order = 1, IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
@@ -87,27 +87,27 @@ public class InnsenderPerson
 
   public class Adresse
   {
-    [XmlElement("adresse1", Order = 1)]
+    [XmlElement("adresse1", Order = 1, IsNullable = true)]
     [JsonProperty("adresse1")]
     [JsonPropertyName("adresse1")]
     public string adresse1 { get; set; }
 
-    [XmlElement("adresse2", Order = 2)]
+    [XmlElement("adresse2", Order = 2, IsNullable = true)]
     [JsonProperty("adresse2")]
     [JsonPropertyName("adresse2")]
     public string adresse2 { get; set; }
 
-    [XmlElement("postnummer", Order = 3)]
+    [XmlElement("postnummer", Order = 3, IsNullable = true)]
     [JsonProperty("postnummer")]
     [JsonPropertyName("postnummer")]
     public string postnummer { get; set; }
 
-    [XmlElement("poststed", Order = 4)]
+    [XmlElement("poststed", Order = 4, IsNullable = true)]
     [JsonProperty("poststed")]
     [JsonPropertyName("poststed")]
     public string poststed { get; set; }
 
-    [XmlElement("land", Order = 5)]
+    [XmlElement("land", Order = 5, IsNullable = true)]
     [JsonProperty("land")]
     [JsonPropertyName("land")]
     public string land { get; set; }
@@ -116,12 +116,12 @@ public class Adresse
 
   public class InnsenderOrganisasjon
   {
-    [XmlElement("kontaktperson", Order = 1)]
+    [XmlElement("kontaktperson", Order = 1, IsNullable = true)]
     [JsonProperty("kontaktperson")]
     [JsonPropertyName("kontaktperson")]
     public string kontaktperson { get; set; }
 
-    [XmlElement("organisasjonsnavn", Order = 2)]
+    [XmlElement("organisasjonsnavn", Order = 2, IsNullable = true)]
     [JsonProperty("organisasjonsnavn")]
     [JsonPropertyName("organisasjonsnavn")]
     public string organisasjonsnavn { get; set; }
@@ -158,7 +158,7 @@ public class InnsenderOrganisasjon
 
   public class HvemGjelderHenvendelsen
   {
-    [XmlElement("navn", Order = 1)]
+    [XmlElement("navn", Order = 1, IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
@@ -179,7 +179,7 @@ public class HvemGjelderHenvendelsen
 
   public class HvorSkalHenvendelsenSendes
   {
-    [XmlElement("fylke", Order = 1)]
+    [XmlElement("fylke", Order = 1, IsNullable = true)]
     [JsonProperty("fylke")]
     [JsonPropertyName("fylke")]
     public string fylke { get; set; }
@@ -188,7 +188,7 @@ public class HvorSkalHenvendelsenSendes
 
   public class SkjemaSpesifikt
   {
-    [XmlElement("andreBehov", Order = 1)]
+    [XmlElement("andreBehov", Order = 1, IsNullable = true)]
     [JsonProperty("andreBehov")]
     [JsonPropertyName("andreBehov")]
     public string andreBehov { get; set; }
@@ -283,12 +283,12 @@ public class SkjemaSpesifikt
     [JsonPropertyName("hjelpeapparat")]
     public Hjelpeapparat hjelpeapparat { get; set; }
 
-    [XmlElement("endringEllerNy", Order = 20)]
+    [XmlElement("endringEllerNy", Order = 20, IsNullable = true)]
     [JsonProperty("endringEllerNy")]
     [JsonPropertyName("endringEllerNy")]
     public string endringEllerNy { get; set; }
 
-    [XmlElement("innsenderRelasjon", Order = 21)]
+    [XmlElement("innsenderRelasjon", Order = 21, IsNullable = true)]
     [JsonProperty("innsenderRelasjon")]
     [JsonPropertyName("innsenderRelasjon")]
     public string innsenderRelasjon { get; set; }
@@ -297,12 +297,12 @@ public class SkjemaSpesifikt
 
   public class Bank
   {
-    [XmlElement("bankRepresentasjon", Order = 1)]
+    [XmlElement("bankRepresentasjon", Order = 1, IsNullable = true)]
     [JsonProperty("bankRepresentasjon")]
     [JsonPropertyName("bankRepresentasjon")]
     public string bankRepresentasjon { get; set; }
 
-    [XmlElement("bankLaan", Order = 2)]
+    [XmlElement("bankLaan", Order = 2, IsNullable = true)]
     [JsonProperty("bankLaan")]
     [JsonPropertyName("bankLaan")]
     public string bankLaan { get; set; }
@@ -311,7 +311,7 @@ public class Bank
 
   public class Forsikringsselskap
   {
-    [XmlElement("forsikringForvalte", Order = 1)]
+    [XmlElement("forsikringForvalte", Order = 1, IsNullable = true)]
     [JsonProperty("forsikringForvalte")]
     [JsonPropertyName("forsikringForvalte")]
     public string forsikringForvalte { get; set; }
@@ -320,12 +320,12 @@ public class Forsikringsselskap
 
   public class Helfo
   {
-    [XmlElement("helfoRefusjon", Order = 1)]
+    [XmlElement("helfoRefusjon", Order = 1, IsNullable = true)]
     [JsonProperty("helfoRefusjon")]
     [JsonPropertyName("helfoRefusjon")]
     public string helfoRefusjon { get; set; }
 
-    [XmlElement("helfoFastlege", Order = 2)]
+    [XmlElement("helfoFastlege", Order = 2, IsNullable = true)]
     [JsonProperty("helfoFastlege")]
     [JsonPropertyName("helfoFastlege")]
     public string helfoFastlege { get; set; }
@@ -334,12 +334,12 @@ public class Helfo
 
   public class Husbanken
   {
-    [XmlElement("husbankenBostoette", Order = 1)]
+    [XmlElement("husbankenBostoette", Order = 1, IsNullable = true)]
     [JsonProperty("husbankenBostoette")]
     [JsonPropertyName("husbankenBostoette")]
     public string husbankenBostoette { get; set; }
 
-    [XmlElement("husbankenStartlaan", Order = 2)]
+    [XmlElement("husbankenStartlaan", Order = 2, IsNullable = true)]
     [JsonProperty("husbankenStartlaan")]
     [JsonPropertyName("husbankenStartlaan")]
     public string husbankenStartlaan { get; set; }
@@ -348,7 +348,7 @@ public class Husbanken
 
   public class Inkassoselskap
   {
-    [XmlElement("inkasseForhandle", Order = 1)]
+    [XmlElement("inkasseForhandle", Order = 1, IsNullable = true)]
     [JsonProperty("inkasseForhandle")]
     [JsonPropertyName("inkasseForhandle")]
     public string inkasseForhandle { get; set; }
@@ -357,7 +357,7 @@ public class Inkassoselskap
 
   public class Innkreving
   {
-    [XmlElement("innkrevingGjeldsordning", Order = 1)]
+    [XmlElement("innkrevingGjeldsordning", Order = 1, IsNullable = true)]
     [JsonProperty("innkrevingGjeldsordning")]
     [JsonPropertyName("innkrevingGjeldsordning")]
     public string innkrevingGjeldsordning { get; set; }
@@ -366,37 +366,37 @@ public class Innkreving
 
   public class Kartverket
   {
-    [XmlElement("kartSalgEiendom", Order = 1)]
+    [XmlElement("kartSalgEiendom", Order = 1, IsNullable = true)]
     [JsonProperty("kartSalgEiendom")]
     [JsonPropertyName("kartSalgEiendom")]
     public string kartSalgEiendom { get; set; }
 
-    [XmlElement("kartKjoepEiendom", Order = 2)]
+    [XmlElement("kartKjoepEiendom", Order = 2, IsNullable = true)]
     [JsonProperty("kartKjoepEiendom")]
     [JsonPropertyName("kartKjoepEiendom")]
     public string kartKjoepEiendom { get; set; }
 
-    [XmlElement("kartArv", Order = 3)]
+    [XmlElement("kartArv", Order = 3, IsNullable = true)]
     [JsonProperty("kartArv")]
     [JsonPropertyName("kartArv")]
     public string kartArv { get; set; }
 
-    [XmlElement("kartEndreEiendom", Order = 4)]
+    [XmlElement("kartEndreEiendom", Order = 4, IsNullable = true)]
     [JsonProperty("kartEndreEiendom")]
     [JsonPropertyName("kartEndreEiendom")]
     public string kartEndreEiendom { get; set; }
 
-    [XmlElement("kartAvtaler", Order = 5)]
+    [XmlElement("kartAvtaler", Order = 5, IsNullable = true)]
     [JsonProperty("kartAvtaler")]
     [JsonPropertyName("kartAvtaler")]
     public string kartAvtaler { get; set; }
 
-    [XmlElement("kartSletting", Order = 6)]
+    [XmlElement("kartSletting", Order = 6, IsNullable = true)]
     [JsonProperty("kartSletting")]
     [JsonPropertyName("kartSletting")]
     public string kartSletting { get; set; }
 
-    [XmlElement("kartLaaneopptak", Order = 7)]
+    [XmlElement("kartLaaneopptak", Order = 7, IsNullable = true)]
     [JsonProperty("kartLaaneopptak")]
     [JsonPropertyName("kartLaaneopptak")]
     public string kartLaaneopptak { get; set; }
@@ -405,27 +405,27 @@ public class Kartverket
 
   public class Kommune
   {
-    [XmlElement("kommuneBygg", Order = 1)]
+    [XmlElement("kommuneBygg", Order = 1, IsNullable = true)]
     [JsonProperty("kommuneBygg")]
     [JsonPropertyName("kommuneBygg")]
     public string kommuneBygg { get; set; }
 
-    [XmlElement("kommuneHelse", Order = 2)]
+    [XmlElement("kommuneHelse", Order = 2, IsNullable = true)]
     [JsonProperty("kommuneHelse")]
     [JsonPropertyName("kommuneHelse")]
     public string kommuneHelse { get; set; }
 
-    [XmlElement("kommuneSosial", Order = 3)]
+    [XmlElement("kommuneSosial", Order = 3, IsNullable = true)]
     [JsonProperty("kommuneSosial")]
     [JsonPropertyName("kommuneSosial")]
     public string kommuneSosial { get; set; }
 
-    [XmlElement("kommuneSkole", Order = 4)]
+    [XmlElement("kommuneSkole", Order = 4, IsNullable = true)]
     [JsonProperty("kommuneSkole")]
     [JsonPropertyName("kommuneSkole")]
     public string kommuneSkole { get; set; }
 
-    [XmlElement("kommuneSkatt", Order = 5)]
+    [XmlElement("kommuneSkatt", Order = 5, IsNullable = true)]
     [JsonProperty("kommuneSkatt")]
     [JsonPropertyName("kommuneSkatt")]
     public string kommuneSkatt { get; set; }
@@ -434,7 +434,7 @@ public class Kommune
 
   public class Kredittvurderingsselskap
   {
-    [XmlElement("kredittKredittsperre", Order = 1)]
+    [XmlElement("kredittKredittsperre", Order = 1, IsNullable = true)]
     [JsonProperty("kredittKredittsperre")]
     [JsonPropertyName("kredittKredittsperre")]
     public string kredittKredittsperre { get; set; }
@@ -443,12 +443,12 @@ public class Kredittvurderingsselskap
 
   public class Namsmannen
   {
-    [XmlElement("namsmannenGjeldsordning", Order = 1)]
+    [XmlElement("namsmannenGjeldsordning", Order = 1, IsNullable = true)]
     [JsonProperty("namsmannenGjeldsordning")]
     [JsonPropertyName("namsmannenGjeldsordning")]
     public string namsmannenGjeldsordning { get; set; }
 
-    [XmlElement("namsmannenTvangsfullbyrdelse", Order = 2)]
+    [XmlElement("namsmannenTvangsfullbyrdelse", Order = 2, IsNullable = true)]
     [JsonProperty("namsmannenTvangsfullbyrdelse")]
     [JsonPropertyName("namsmannenTvangsfullbyrdelse")]
     public string namsmannenTvangsfullbyrdelse { get; set; }
@@ -457,27 +457,27 @@ public class Namsmannen
 
   public class Nav
   {
-    [XmlElement("navArbeid", Order = 1)]
+    [XmlElement("navArbeid", Order = 1, IsNullable = true)]
     [JsonProperty("navArbeid")]
     [JsonPropertyName("navArbeid")]
     public string navArbeid { get; set; }
 
-    [XmlElement("navFamilie", Order = 2)]
+    [XmlElement("navFamilie", Order = 2, IsNullable = true)]
     [JsonProperty("navFamilie")]
     [JsonPropertyName("navFamilie")]
     public string navFamilie { get; set; }
 
-    [XmlElement("navHjelpemidler", Order = 3)]
+    [XmlElement("navHjelpemidler", Order = 3, IsNullable = true)]
     [JsonProperty("navHjelpemidler")]
     [JsonPropertyName("navHjelpemidler")]
     public string navHjelpemidler { get; set; }
 
-    [XmlElement("navPensjon", Order = 4)]
+    [XmlElement("navPensjon", Order = 4, IsNullable = true)]
     [JsonProperty("navPensjon")]
     [JsonPropertyName("navPensjon")]
     public string navPensjon { get; set; }
 
-    [XmlElement("navSosial", Order = 5)]
+    [XmlElement("navSosial", Order = 5, IsNullable = true)]
     [JsonProperty("navSosial")]
     [JsonPropertyName("navSosial")]
     public string navSosial { get; set; }
@@ -486,7 +486,7 @@ public class Nav
 
   public class Pasientreiser
   {
-    [XmlElement("pasientRefusjon", Order = 1)]
+    [XmlElement("pasientRefusjon", Order = 1, IsNullable = true)]
     [JsonProperty("pasientRefusjon")]
     [JsonPropertyName("pasientRefusjon")]
     public string pasientRefusjon { get; set; }
@@ -495,22 +495,22 @@ public class Pasientreiser
 
   public class Skatteetaten
   {
-    [XmlElement("skattInnkreving", Order = 1)]
+    [XmlElement("skattInnkreving", Order = 1, IsNullable = true)]
     [JsonProperty("skattInnkreving")]
     [JsonPropertyName("skattInnkreving")]
     public string skattInnkreving { get; set; }
 
-    [XmlElement("skattPostadresse", Order = 2)]
+    [XmlElement("skattPostadresse", Order = 2, IsNullable = true)]
     [JsonProperty("skattPostadresse")]
     [JsonPropertyName("skattPostadresse")]
     public string skattPostadresse { get; set; }
 
-    [XmlElement("skattFlytting", Order = 3)]
+    [XmlElement("skattFlytting", Order = 3, IsNullable = true)]
     [JsonProperty("skattFlytting")]
     [JsonPropertyName("skattFlytting")]
     public string skattFlytting { get; set; }
 
-    [XmlElement("skattSkatt", Order = 4)]
+    [XmlElement("skattSkatt", Order = 4, IsNullable = true)]
     [JsonProperty("skattSkatt")]
     [JsonPropertyName("skattSkatt")]
     public string skattSkatt { get; set; }
@@ -519,17 +519,17 @@ public class Skatteetaten
 
   public class Tingretten
   {
-    [XmlElement("tingrettUskifte", Order = 1)]
+    [XmlElement("tingrettUskifte", Order = 1, IsNullable = true)]
     [JsonProperty("tingrettUskifte")]
     [JsonPropertyName("tingrettUskifte")]
     public string tingrettUskifte { get; set; }
 
-    [XmlElement("tingrettPrivatDoedsbo", Order = 2)]
+    [XmlElement("tingrettPrivatDoedsbo", Order = 2, IsNullable = true)]
     [JsonProperty("tingrettPrivatDoedsbo")]
     [JsonPropertyName("tingrettPrivatDoedsbo")]
     public string tingrettPrivatDoedsbo { get; set; }
 
-    [XmlElement("tingrettBegjaereDoedsbo", Order = 3)]
+    [XmlElement("tingrettBegjaereDoedsbo", Order = 3, IsNullable = true)]
     [JsonProperty("tingrettBegjaereDoedsbo")]
     [JsonPropertyName("tingrettBegjaereDoedsbo")]
     public string tingrettBegjaereDoedsbo { get; set; }
@@ -538,27 +538,27 @@ public class Tingretten
 
   public class OEvrige
   {
-    [XmlElement("oevrigeKjoepVarer", Order = 1)]
+    [XmlElement("oevrigeKjoepVarer", Order = 1, IsNullable = true)]
     [JsonProperty("oevrigeKjoepVarer")]
     [JsonPropertyName("oevrigeKjoepVarer")]
     public string oevrigeKjoepVarer { get; set; }
 
-    [XmlElement("oevrigeHusleiekontrakt", Order = 2)]
+    [XmlElement("oevrigeHusleiekontrakt", Order = 2, IsNullable = true)]
     [JsonProperty("oevrigeHusleiekontrakt")]
     [JsonPropertyName("oevrigeHusleiekontrakt")]
     public string oevrigeHusleiekontrakt { get; set; }
 
-    [XmlElement("oevrigeLoesoere", Order = 3)]
+    [XmlElement("oevrigeLoesoere", Order = 3, IsNullable = true)]
     [JsonProperty("oevrigeLoesoere")]
     [JsonPropertyName("oevrigeLoesoere")]
     public string oevrigeLoesoere { get; set; }
 
-    [XmlElement("oevrigeUtgifter", Order = 4)]
+    [XmlElement("oevrigeUtgifter", Order = 4, IsNullable = true)]
     [JsonProperty("oevrigeUtgifter")]
     [JsonPropertyName("oevrigeUtgifter")]
     public string oevrigeUtgifter { get; set; }
 
-    [XmlElement("oevrigeAvslutteHusleie", Order = 5)]
+    [XmlElement("oevrigeAvslutteHusleie", Order = 5, IsNullable = true)]
     [JsonProperty("oevrigeAvslutteHusleie")]
     [JsonPropertyName("oevrigeAvslutteHusleie")]
     public string oevrigeAvslutteHusleie { get; set; }
@@ -567,12 +567,12 @@ public class OEvrige
 
   public class Statsforvalter
   {
-    [XmlElement("statsforvalterTvangsvedtak", Order = 1)]
+    [XmlElement("statsforvalterTvangsvedtak", Order = 1, IsNullable = true)]
     [JsonProperty("statsforvalterTvangsvedtak")]
     [JsonPropertyName("statsforvalterTvangsvedtak")]
     public string statsforvalterTvangsvedtak { get; set; }
 
-    [XmlElement("statsforvalterSamtykke", Order = 2)]
+    [XmlElement("statsforvalterSamtykke", Order = 2, IsNullable = true)]
     [JsonProperty("statsforvalterSamtykke")]
     [JsonPropertyName("statsforvalterSamtykke")]
     public string statsforvalterSamtykke { get; set; }
@@ -581,22 +581,22 @@ public class Statsforvalter
 
   public class Vergehaver
   {
-    [XmlElement("telefonsamtaleMulig", Order = 1)]
+    [XmlElement("telefonsamtaleMulig", Order = 1, IsNullable = true)]
     [JsonProperty("telefonsamtaleMulig")]
     [JsonPropertyName("telefonsamtaleMulig")]
     public string telefonsamtaleMulig { get; set; }
 
-    [XmlElement("telefonsamtaleHvorfor", Order = 2)]
+    [XmlElement("telefonsamtaleHvorfor", Order = 2, IsNullable = true)]
     [JsonProperty("telefonsamtaleHvorfor")]
     [JsonPropertyName("telefonsamtaleHvorfor")]
     public string telefonsamtaleHvorfor { get; set; }
 
-    [XmlElement("borPaaInstitusjon", Order = 3)]
+    [XmlElement("borPaaInstitusjon", Order = 3, IsNullable = true)]
     [JsonProperty("borPaaInstitusjon")]
     [JsonPropertyName("borPaaInstitusjon")]
     public string borPaaInstitusjon { get; set; }
 
-    [XmlElement("hvilkenInstitusjon", Order = 4)]
+    [XmlElement("hvilkenInstitusjon", Order = 4, IsNullable = true)]
     [JsonProperty("hvilkenInstitusjon")]
     [JsonPropertyName("hvilkenInstitusjon")]
     public string hvilkenInstitusjon { get; set; }
@@ -622,7 +622,7 @@ public class Hjelpeapparat
     [JsonPropertyName("telefonnummer")]
     public string telefonnummer { get; set; }
 
-    [XmlElement("navn", Order = 2)]
+    [XmlElement("navn", Order = 2, IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
diff --git a/testdata/Model/CSharp/Gitea/srf-melding-til-statsforvalteren.cs b/testdata/Model/CSharp/Gitea/srf-melding-til-statsforvalteren.cs
index de9255a3171..196ac7c59c0 100644
--- a/testdata/Model/CSharp/Gitea/srf-melding-til-statsforvalteren.cs
+++ b/testdata/Model/CSharp/Gitea/srf-melding-til-statsforvalteren.cs
@@ -50,7 +50,7 @@ public class Felles
 
   public class InnsenderPerson
   {
-    [XmlElement("navn", Order = 1)]
+    [XmlElement("navn", Order = 1, IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
@@ -87,27 +87,27 @@ public class InnsenderPerson
 
   public class Adresse
   {
-    [XmlElement("adresse1", Order = 1)]
+    [XmlElement("adresse1", Order = 1, IsNullable = true)]
     [JsonProperty("adresse1")]
     [JsonPropertyName("adresse1")]
     public string adresse1 { get; set; }
 
-    [XmlElement("adresse2", Order = 2)]
+    [XmlElement("adresse2", Order = 2, IsNullable = true)]
     [JsonProperty("adresse2")]
     [JsonPropertyName("adresse2")]
     public string adresse2 { get; set; }
 
-    [XmlElement("postnummer", Order = 3)]
+    [XmlElement("postnummer", Order = 3, IsNullable = true)]
     [JsonProperty("postnummer")]
     [JsonPropertyName("postnummer")]
     public string postnummer { get; set; }
 
-    [XmlElement("poststed", Order = 4)]
+    [XmlElement("poststed", Order = 4, IsNullable = true)]
     [JsonProperty("poststed")]
     [JsonPropertyName("poststed")]
     public string poststed { get; set; }
 
-    [XmlElement("land", Order = 5)]
+    [XmlElement("land", Order = 5, IsNullable = true)]
     [JsonProperty("land")]
     [JsonPropertyName("land")]
     public string land { get; set; }
@@ -116,12 +116,12 @@ public class Adresse
 
   public class InnsenderOrganisasjon
   {
-    [XmlElement("kontaktperson", Order = 1)]
+    [XmlElement("kontaktperson", Order = 1, IsNullable = true)]
     [JsonProperty("kontaktperson")]
     [JsonPropertyName("kontaktperson")]
     public string kontaktperson { get; set; }
 
-    [XmlElement("organisasjonsnavn", Order = 2)]
+    [XmlElement("organisasjonsnavn", Order = 2, IsNullable = true)]
     [JsonProperty("organisasjonsnavn")]
     [JsonPropertyName("organisasjonsnavn")]
     public string organisasjonsnavn { get; set; }
@@ -158,7 +158,7 @@ public class InnsenderOrganisasjon
 
   public class HvemGjelderHenvendelsen
   {
-    [XmlElement("navn", Order = 1)]
+    [XmlElement("navn", Order = 1, IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
@@ -179,7 +179,7 @@ public class HvemGjelderHenvendelsen
 
   public class HvorSkalHenvendelsenSendes
   {
-    [XmlElement("fylke", Order = 1)]
+    [XmlElement("fylke", Order = 1, IsNullable = true)]
     [JsonProperty("fylke")]
     [JsonPropertyName("fylke")]
     public string fylke { get; set; }
@@ -197,17 +197,17 @@ public class SkjemaSpesifikt
 
   public class HvaGjelderHenvendelsen
   {
-    [XmlElement("melding", Order = 1)]
+    [XmlElement("melding", Order = 1, IsNullable = true)]
     [JsonProperty("melding")]
     [JsonPropertyName("melding")]
     public string melding { get; set; }
 
-    [XmlElement("emne", Order = 2)]
+    [XmlElement("emne", Order = 2, IsNullable = true)]
     [JsonProperty("emne")]
     [JsonPropertyName("emne")]
     public string emne { get; set; }
 
-    [XmlElement("tema", Order = 3)]
+    [XmlElement("tema", Order = 3, IsNullable = true)]
     [JsonProperty("tema")]
     [JsonPropertyName("tema")]
     public string tema { get; set; }
diff --git a/testdata/Model/CSharp/XsAll/ferdigattest/v4/ferdigattest.cs b/testdata/Model/CSharp/XsAll/ferdigattest/v4/ferdigattest.cs
index bf702a88ee4..0c71433f931 100644
--- a/testdata/Model/CSharp/XsAll/ferdigattest/v4/ferdigattest.cs
+++ b/testdata/Model/CSharp/XsAll/ferdigattest/v4/ferdigattest.cs
@@ -120,17 +120,17 @@ public class EiendomType
     [JsonPropertyName("adresse")]
     public EiendommensAdresseType adresse { get; set; }
 
-    [XmlElement("bygningsnummer")]
+    [XmlElement("bygningsnummer", IsNullable = true)]
     [JsonProperty("bygningsnummer")]
     [JsonPropertyName("bygningsnummer")]
     public string bygningsnummer { get; set; }
 
-    [XmlElement("bolignummer")]
+    [XmlElement("bolignummer", IsNullable = true)]
     [JsonProperty("bolignummer")]
     [JsonPropertyName("bolignummer")]
     public string bolignummer { get; set; }
 
-    [XmlElement("kommunenavn")]
+    [XmlElement("kommunenavn", IsNullable = true)]
     [JsonProperty("kommunenavn")]
     [JsonPropertyName("kommunenavn")]
     public string kommunenavn { get; set; }
@@ -139,7 +139,7 @@ public class EiendomType
 
   public class MatrikkelnummerType
   {
-    [XmlElement("kommunenummer")]
+    [XmlElement("kommunenummer", IsNullable = true)]
     [JsonProperty("kommunenummer")]
     [JsonPropertyName("kommunenummer")]
     public string kommunenummer { get; set; }
@@ -172,47 +172,47 @@ public class MatrikkelnummerType
 
   public class EiendommensAdresseType
   {
-    [XmlElement("adresselinje1")]
+    [XmlElement("adresselinje1", IsNullable = true)]
     [JsonProperty("adresselinje1")]
     [JsonPropertyName("adresselinje1")]
     public string adresselinje1 { get; set; }
 
-    [XmlElement("adresselinje2")]
+    [XmlElement("adresselinje2", IsNullable = true)]
     [JsonProperty("adresselinje2")]
     [JsonPropertyName("adresselinje2")]
     public string adresselinje2 { get; set; }
 
-    [XmlElement("adresselinje3")]
+    [XmlElement("adresselinje3", IsNullable = true)]
     [JsonProperty("adresselinje3")]
     [JsonPropertyName("adresselinje3")]
     public string adresselinje3 { get; set; }
 
-    [XmlElement("postnr")]
+    [XmlElement("postnr", IsNullable = true)]
     [JsonProperty("postnr")]
     [JsonPropertyName("postnr")]
     public string postnr { get; set; }
 
-    [XmlElement("poststed")]
+    [XmlElement("poststed", IsNullable = true)]
     [JsonProperty("poststed")]
     [JsonPropertyName("poststed")]
     public string poststed { get; set; }
 
-    [XmlElement("landkode")]
+    [XmlElement("landkode", IsNullable = true)]
     [JsonProperty("landkode")]
     [JsonPropertyName("landkode")]
     public string landkode { get; set; }
 
-    [XmlElement("gatenavn")]
+    [XmlElement("gatenavn", IsNullable = true)]
     [JsonProperty("gatenavn")]
     [JsonPropertyName("gatenavn")]
     public string gatenavn { get; set; }
 
-    [XmlElement("husnr")]
+    [XmlElement("husnr", IsNullable = true)]
     [JsonProperty("husnr")]
     [JsonPropertyName("husnr")]
     public string husnr { get; set; }
 
-    [XmlElement("bokstav")]
+    [XmlElement("bokstav", IsNullable = true)]
     [JsonProperty("bokstav")]
     [JsonPropertyName("bokstav")]
     public string bokstav { get; set; }
@@ -237,22 +237,22 @@ public class SaksnummerType
 
   public class MetadataType
   {
-    [XmlElement("fraSluttbrukersystem")]
+    [XmlElement("fraSluttbrukersystem", IsNullable = true)]
     [JsonProperty("fraSluttbrukersystem")]
     [JsonPropertyName("fraSluttbrukersystem")]
     public string fraSluttbrukersystem { get; set; }
 
-    [XmlElement("ftbId")]
+    [XmlElement("ftbId", IsNullable = true)]
     [JsonProperty("ftbId")]
     [JsonPropertyName("ftbId")]
     public string ftbId { get; set; }
 
-    [XmlElement("prosjektnavn")]
+    [XmlElement("prosjektnavn", IsNullable = true)]
     [JsonProperty("prosjektnavn")]
     [JsonPropertyName("prosjektnavn")]
     public string prosjektnavn { get; set; }
 
-    [XmlElement("prosjektnr")]
+    [XmlElement("prosjektnr", IsNullable = true)]
     [JsonProperty("prosjektnr")]
     [JsonPropertyName("prosjektnr")]
     public string prosjektnr { get; set; }
@@ -274,12 +274,12 @@ public class KodeType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("kodeverdi")]
+    [XmlElement("kodeverdi", IsNullable = true)]
     [JsonProperty("kodeverdi")]
     [JsonPropertyName("kodeverdi")]
     public string kodeverdi { get; set; }
 
-    [XmlElement("kodebeskrivelse")]
+    [XmlElement("kodebeskrivelse", IsNullable = true)]
     [JsonProperty("kodebeskrivelse")]
     [JsonPropertyName("kodebeskrivelse")]
     public string kodebeskrivelse { get; set; }
@@ -302,7 +302,7 @@ public class BeskrivelseAvTiltakType
     [JsonPropertyName("type")]
     public KodeListe type { get; set; }
 
-    [XmlElement("foelgebrev")]
+    [XmlElement("foelgebrev", IsNullable = true)]
     [JsonProperty("foelgebrev")]
     [JsonPropertyName("foelgebrev")]
     public string foelgebrev { get; set; }
@@ -337,7 +337,7 @@ public class UtfallSvarType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("utfallId")]
+    [XmlElement("utfallId", IsNullable = true)]
     [JsonProperty("utfallId")]
     [JsonPropertyName("utfallId")]
     public string utfallId { get; set; }
@@ -357,12 +357,12 @@ public class UtfallSvarType
     [JsonPropertyName("tema")]
     public KodeType tema { get; set; }
 
-    [XmlElement("tittel")]
+    [XmlElement("tittel", IsNullable = true)]
     [JsonProperty("tittel")]
     [JsonPropertyName("tittel")]
     public string tittel { get; set; }
 
-    [XmlElement("beskrivelse")]
+    [XmlElement("beskrivelse", IsNullable = true)]
     [JsonProperty("beskrivelse")]
     [JsonPropertyName("beskrivelse")]
     public string beskrivelse { get; set; }
@@ -377,7 +377,7 @@ public class UtfallSvarType
     [JsonPropertyName("erUtfallBesvart")]
     public bool? erUtfallBesvart { get; set; }
 
-    [XmlElement("kommentar")]
+    [XmlElement("kommentar", IsNullable = true)]
     [JsonProperty("kommentar")]
     [JsonPropertyName("kommentar")]
     public string kommentar { get; set; }
@@ -391,12 +391,12 @@ public class UtfallSvarType
 
   public class SjekkpunktType
   {
-    [XmlElement("sjekkpunktId")]
+    [XmlElement("sjekkpunktId", IsNullable = true)]
     [JsonProperty("sjekkpunktId")]
     [JsonPropertyName("sjekkpunktId")]
     public string sjekkpunktId { get; set; }
 
-    [XmlElement("sjekkpunktEier")]
+    [XmlElement("sjekkpunktEier", IsNullable = true)]
     [JsonProperty("sjekkpunktEier")]
     [JsonPropertyName("sjekkpunktEier")]
     public string sjekkpunktEier { get; set; }
@@ -422,7 +422,7 @@ public class VedleggType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("versjonsnummer")]
+    [XmlElement("versjonsnummer", IsNullable = true)]
     [JsonProperty("versjonsnummer")]
     [JsonPropertyName("versjonsnummer")]
     public string versjonsnummer { get; set; }
@@ -433,12 +433,12 @@ public class VedleggType
     public KodeType vedleggstype { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("versjonsdato")]
+    [XmlElement("versjonsdato", IsNullable = true)]
     [JsonProperty("versjonsdato")]
     [JsonPropertyName("versjonsdato")]
     public string versjonsdato { get; set; }
 
-    [XmlElement("filnavn")]
+    [XmlElement("filnavn", IsNullable = true)]
     [JsonProperty("filnavn")]
     [JsonPropertyName("filnavn")]
     public string filnavn { get; set; }
@@ -453,18 +453,18 @@ public class KravFerdigattestType
     public bool? tilfredsstillerTiltaketKraveneFerdigattest { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("utfoertInnen")]
+    [XmlElement("utfoertInnen", IsNullable = true)]
     [JsonProperty("utfoertInnen")]
     [JsonPropertyName("utfoertInnen")]
     public string utfoertInnen { get; set; }
 
-    [XmlElement("typeArbeider")]
+    [XmlElement("typeArbeider", IsNullable = true)]
     [JsonProperty("typeArbeider")]
     [JsonPropertyName("typeArbeider")]
     public string typeArbeider { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("bekreftelseInnen")]
+    [XmlElement("bekreftelseInnen", IsNullable = true)]
     [JsonProperty("bekreftelseInnen")]
     [JsonPropertyName("bekreftelseInnen")]
     public string bekreftelseInnen { get; set; }
@@ -497,17 +497,17 @@ public class PartType
     [JsonPropertyName("partstype")]
     public KodeType partstype { get; set; }
 
-    [XmlElement("foedselsnummer")]
+    [XmlElement("foedselsnummer", IsNullable = true)]
     [JsonProperty("foedselsnummer")]
     [JsonPropertyName("foedselsnummer")]
     public string foedselsnummer { get; set; }
 
-    [XmlElement("organisasjonsnummer")]
+    [XmlElement("organisasjonsnummer", IsNullable = true)]
     [JsonProperty("organisasjonsnummer")]
     [JsonPropertyName("organisasjonsnummer")]
     public string organisasjonsnummer { get; set; }
 
-    [XmlElement("navn")]
+    [XmlElement("navn", IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
@@ -517,17 +517,17 @@ public class PartType
     [JsonPropertyName("adresse")]
     public EnkelAdresseType adresse { get; set; }
 
-    [XmlElement("telefonnummer")]
+    [XmlElement("telefonnummer", IsNullable = true)]
     [JsonProperty("telefonnummer")]
     [JsonPropertyName("telefonnummer")]
     public string telefonnummer { get; set; }
 
-    [XmlElement("mobilnummer")]
+    [XmlElement("mobilnummer", IsNullable = true)]
     [JsonProperty("mobilnummer")]
     [JsonPropertyName("mobilnummer")]
     public string mobilnummer { get; set; }
 
-    [XmlElement("epost")]
+    [XmlElement("epost", IsNullable = true)]
     [JsonProperty("epost")]
     [JsonPropertyName("epost")]
     public string epost { get; set; }
@@ -541,32 +541,32 @@ public class PartType
 
   public class EnkelAdresseType
   {
-    [XmlElement("adresselinje1")]
+    [XmlElement("adresselinje1", IsNullable = true)]
     [JsonProperty("adresselinje1")]
     [JsonPropertyName("adresselinje1")]
     public string adresselinje1 { get; set; }
 
-    [XmlElement("adresselinje2")]
+    [XmlElement("adresselinje2", IsNullable = true)]
     [JsonProperty("adresselinje2")]
     [JsonPropertyName("adresselinje2")]
     public string adresselinje2 { get; set; }
 
-    [XmlElement("adresselinje3")]
+    [XmlElement("adresselinje3", IsNullable = true)]
     [JsonProperty("adresselinje3")]
     [JsonPropertyName("adresselinje3")]
     public string adresselinje3 { get; set; }
 
-    [XmlElement("postnr")]
+    [XmlElement("postnr", IsNullable = true)]
     [JsonProperty("postnr")]
     [JsonPropertyName("postnr")]
     public string postnr { get; set; }
 
-    [XmlElement("poststed")]
+    [XmlElement("poststed", IsNullable = true)]
     [JsonProperty("poststed")]
     [JsonPropertyName("poststed")]
     public string poststed { get; set; }
 
-    [XmlElement("landkode")]
+    [XmlElement("landkode", IsNullable = true)]
     [JsonProperty("landkode")]
     [JsonPropertyName("landkode")]
     public string landkode { get; set; }
@@ -575,22 +575,22 @@ public class EnkelAdresseType
 
   public class KontaktpersonType
   {
-    [XmlElement("navn")]
+    [XmlElement("navn", IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
 
-    [XmlElement("telefonnummer")]
+    [XmlElement("telefonnummer", IsNullable = true)]
     [JsonProperty("telefonnummer")]
     [JsonPropertyName("telefonnummer")]
     public string telefonnummer { get; set; }
 
-    [XmlElement("mobilnummer")]
+    [XmlElement("mobilnummer", IsNullable = true)]
     [JsonProperty("mobilnummer")]
     [JsonPropertyName("mobilnummer")]
     public string mobilnummer { get; set; }
 
-    [XmlElement("epost")]
+    [XmlElement("epost", IsNullable = true)]
     [JsonProperty("epost")]
     [JsonPropertyName("epost")]
     public string epost { get; set; }
diff --git a/testdata/Model/CSharp/XsAll/igangsettingstillatelse/v4/igangsettingstillatelse.cs b/testdata/Model/CSharp/XsAll/igangsettingstillatelse/v4/igangsettingstillatelse.cs
index 195769e2aee..fcdc09257b8 100644
--- a/testdata/Model/CSharp/XsAll/igangsettingstillatelse/v4/igangsettingstillatelse.cs
+++ b/testdata/Model/CSharp/XsAll/igangsettingstillatelse/v4/igangsettingstillatelse.cs
@@ -100,17 +100,17 @@ public class EiendomType
     [JsonPropertyName("adresse")]
     public EiendommensAdresseType adresse { get; set; }
 
-    [XmlElement("bygningsnummer")]
+    [XmlElement("bygningsnummer", IsNullable = true)]
     [JsonProperty("bygningsnummer")]
     [JsonPropertyName("bygningsnummer")]
     public string bygningsnummer { get; set; }
 
-    [XmlElement("bolignummer")]
+    [XmlElement("bolignummer", IsNullable = true)]
     [JsonProperty("bolignummer")]
     [JsonPropertyName("bolignummer")]
     public string bolignummer { get; set; }
 
-    [XmlElement("kommunenavn")]
+    [XmlElement("kommunenavn", IsNullable = true)]
     [JsonProperty("kommunenavn")]
     [JsonPropertyName("kommunenavn")]
     public string kommunenavn { get; set; }
@@ -119,7 +119,7 @@ public class EiendomType
 
   public class MatrikkelnummerType
   {
-    [XmlElement("kommunenummer")]
+    [XmlElement("kommunenummer", IsNullable = true)]
     [JsonProperty("kommunenummer")]
     [JsonPropertyName("kommunenummer")]
     public string kommunenummer { get; set; }
@@ -152,47 +152,47 @@ public class MatrikkelnummerType
 
   public class EiendommensAdresseType
   {
-    [XmlElement("adresselinje1")]
+    [XmlElement("adresselinje1", IsNullable = true)]
     [JsonProperty("adresselinje1")]
     [JsonPropertyName("adresselinje1")]
     public string adresselinje1 { get; set; }
 
-    [XmlElement("adresselinje2")]
+    [XmlElement("adresselinje2", IsNullable = true)]
     [JsonProperty("adresselinje2")]
     [JsonPropertyName("adresselinje2")]
     public string adresselinje2 { get; set; }
 
-    [XmlElement("adresselinje3")]
+    [XmlElement("adresselinje3", IsNullable = true)]
     [JsonProperty("adresselinje3")]
     [JsonPropertyName("adresselinje3")]
     public string adresselinje3 { get; set; }
 
-    [XmlElement("postnr")]
+    [XmlElement("postnr", IsNullable = true)]
     [JsonProperty("postnr")]
     [JsonPropertyName("postnr")]
     public string postnr { get; set; }
 
-    [XmlElement("poststed")]
+    [XmlElement("poststed", IsNullable = true)]
     [JsonProperty("poststed")]
     [JsonPropertyName("poststed")]
     public string poststed { get; set; }
 
-    [XmlElement("landkode")]
+    [XmlElement("landkode", IsNullable = true)]
     [JsonProperty("landkode")]
     [JsonPropertyName("landkode")]
     public string landkode { get; set; }
 
-    [XmlElement("gatenavn")]
+    [XmlElement("gatenavn", IsNullable = true)]
     [JsonProperty("gatenavn")]
     [JsonPropertyName("gatenavn")]
     public string gatenavn { get; set; }
 
-    [XmlElement("husnr")]
+    [XmlElement("husnr", IsNullable = true)]
     [JsonProperty("husnr")]
     [JsonPropertyName("husnr")]
     public string husnr { get; set; }
 
-    [XmlElement("bokstav")]
+    [XmlElement("bokstav", IsNullable = true)]
     [JsonProperty("bokstav")]
     [JsonPropertyName("bokstav")]
     public string bokstav { get; set; }
@@ -217,22 +217,22 @@ public class SaksnummerType
 
   public class MetadataType
   {
-    [XmlElement("fraSluttbrukersystem")]
+    [XmlElement("fraSluttbrukersystem", IsNullable = true)]
     [JsonProperty("fraSluttbrukersystem")]
     [JsonPropertyName("fraSluttbrukersystem")]
     public string fraSluttbrukersystem { get; set; }
 
-    [XmlElement("ftbId")]
+    [XmlElement("ftbId", IsNullable = true)]
     [JsonProperty("ftbId")]
     [JsonPropertyName("ftbId")]
     public string ftbId { get; set; }
 
-    [XmlElement("prosjektnavn")]
+    [XmlElement("prosjektnavn", IsNullable = true)]
     [JsonProperty("prosjektnavn")]
     [JsonPropertyName("prosjektnavn")]
     public string prosjektnavn { get; set; }
 
-    [XmlElement("prosjektnr")]
+    [XmlElement("prosjektnr", IsNullable = true)]
     [JsonProperty("prosjektnr")]
     [JsonPropertyName("prosjektnr")]
     public string prosjektnr { get; set; }
@@ -254,12 +254,12 @@ public class KodeType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("kodeverdi")]
+    [XmlElement("kodeverdi", IsNullable = true)]
     [JsonProperty("kodeverdi")]
     [JsonPropertyName("kodeverdi")]
     public string kodeverdi { get; set; }
 
-    [XmlElement("kodebeskrivelse")]
+    [XmlElement("kodebeskrivelse", IsNullable = true)]
     [JsonProperty("kodebeskrivelse")]
     [JsonPropertyName("kodebeskrivelse")]
     public string kodebeskrivelse { get; set; }
@@ -287,7 +287,7 @@ public class SoeknadenGjelderType
     [JsonPropertyName("gjelderHeleTiltaket")]
     public bool? gjelderHeleTiltaket { get; set; }
 
-    [XmlElement("delAvTiltaket")]
+    [XmlElement("delAvTiltaket", IsNullable = true)]
     [JsonProperty("delAvTiltaket")]
     [JsonPropertyName("delAvTiltaket")]
     public string delAvTiltaket { get; set; }
@@ -297,12 +297,12 @@ public class SoeknadenGjelderType
     [JsonPropertyName("type")]
     public KodeListe type { get; set; }
 
-    [XmlElement("delsoeknadsnummer")]
+    [XmlElement("delsoeknadsnummer", IsNullable = true)]
     [JsonProperty("delsoeknadsnummer")]
     [JsonPropertyName("delsoeknadsnummer")]
     public string delsoeknadsnummer { get; set; }
 
-    [XmlElement("foelgebrev")]
+    [XmlElement("foelgebrev", IsNullable = true)]
     [JsonProperty("foelgebrev")]
     [JsonPropertyName("foelgebrev")]
     public string foelgebrev { get; set; }
@@ -337,18 +337,18 @@ public class DelsoeknadType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("delAvTiltaket")]
+    [XmlElement("delAvTiltaket", IsNullable = true)]
     [JsonProperty("delAvTiltaket")]
     [JsonPropertyName("delAvTiltaket")]
     public string delAvTiltaket { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("tillatelsedato")]
+    [XmlElement("tillatelsedato", IsNullable = true)]
     [JsonProperty("tillatelsedato")]
     [JsonPropertyName("tillatelsedato")]
     public string tillatelsedato { get; set; }
 
-    [XmlElement("kommentar")]
+    [XmlElement("kommentar", IsNullable = true)]
     [JsonProperty("kommentar")]
     [JsonPropertyName("kommentar")]
     public string kommentar { get; set; }
@@ -358,7 +358,7 @@ public class DelsoeknadType
     [JsonPropertyName("type")]
     public KodeListe type { get; set; }
 
-    [XmlElement("delsoeknadsnummer")]
+    [XmlElement("delsoeknadsnummer", IsNullable = true)]
     [JsonProperty("delsoeknadsnummer")]
     [JsonPropertyName("delsoeknadsnummer")]
     public string delsoeknadsnummer { get; set; }
@@ -384,7 +384,7 @@ public class UtfallSvarType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("utfallId")]
+    [XmlElement("utfallId", IsNullable = true)]
     [JsonProperty("utfallId")]
     [JsonPropertyName("utfallId")]
     public string utfallId { get; set; }
@@ -404,12 +404,12 @@ public class UtfallSvarType
     [JsonPropertyName("tema")]
     public KodeType tema { get; set; }
 
-    [XmlElement("tittel")]
+    [XmlElement("tittel", IsNullable = true)]
     [JsonProperty("tittel")]
     [JsonPropertyName("tittel")]
     public string tittel { get; set; }
 
-    [XmlElement("beskrivelse")]
+    [XmlElement("beskrivelse", IsNullable = true)]
     [JsonProperty("beskrivelse")]
     [JsonPropertyName("beskrivelse")]
     public string beskrivelse { get; set; }
@@ -424,7 +424,7 @@ public class UtfallSvarType
     [JsonPropertyName("erUtfallBesvart")]
     public bool? erUtfallBesvart { get; set; }
 
-    [XmlElement("kommentar")]
+    [XmlElement("kommentar", IsNullable = true)]
     [JsonProperty("kommentar")]
     [JsonPropertyName("kommentar")]
     public string kommentar { get; set; }
@@ -438,12 +438,12 @@ public class UtfallSvarType
 
   public class SjekkpunktType
   {
-    [XmlElement("sjekkpunktId")]
+    [XmlElement("sjekkpunktId", IsNullable = true)]
     [JsonProperty("sjekkpunktId")]
     [JsonPropertyName("sjekkpunktId")]
     public string sjekkpunktId { get; set; }
 
-    [XmlElement("sjekkpunktEier")]
+    [XmlElement("sjekkpunktEier", IsNullable = true)]
     [JsonProperty("sjekkpunktEier")]
     [JsonPropertyName("sjekkpunktEier")]
     public string sjekkpunktEier { get; set; }
@@ -469,7 +469,7 @@ public class VedleggType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("versjonsnummer")]
+    [XmlElement("versjonsnummer", IsNullable = true)]
     [JsonProperty("versjonsnummer")]
     [JsonPropertyName("versjonsnummer")]
     public string versjonsnummer { get; set; }
@@ -480,12 +480,12 @@ public class VedleggType
     public KodeType vedleggstype { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("versjonsdato")]
+    [XmlElement("versjonsdato", IsNullable = true)]
     [JsonProperty("versjonsdato")]
     [JsonPropertyName("versjonsdato")]
     public string versjonsdato { get; set; }
 
-    [XmlElement("filnavn")]
+    [XmlElement("filnavn", IsNullable = true)]
     [JsonProperty("filnavn")]
     [JsonPropertyName("filnavn")]
     public string filnavn { get; set; }
@@ -499,17 +499,17 @@ public class PartType
     [JsonPropertyName("partstype")]
     public KodeType partstype { get; set; }
 
-    [XmlElement("foedselsnummer")]
+    [XmlElement("foedselsnummer", IsNullable = true)]
     [JsonProperty("foedselsnummer")]
     [JsonPropertyName("foedselsnummer")]
     public string foedselsnummer { get; set; }
 
-    [XmlElement("organisasjonsnummer")]
+    [XmlElement("organisasjonsnummer", IsNullable = true)]
     [JsonProperty("organisasjonsnummer")]
     [JsonPropertyName("organisasjonsnummer")]
     public string organisasjonsnummer { get; set; }
 
-    [XmlElement("navn")]
+    [XmlElement("navn", IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
@@ -519,17 +519,17 @@ public class PartType
     [JsonPropertyName("adresse")]
     public EnkelAdresseType adresse { get; set; }
 
-    [XmlElement("telefonnummer")]
+    [XmlElement("telefonnummer", IsNullable = true)]
     [JsonProperty("telefonnummer")]
     [JsonPropertyName("telefonnummer")]
     public string telefonnummer { get; set; }
 
-    [XmlElement("mobilnummer")]
+    [XmlElement("mobilnummer", IsNullable = true)]
     [JsonProperty("mobilnummer")]
     [JsonPropertyName("mobilnummer")]
     public string mobilnummer { get; set; }
 
-    [XmlElement("epost")]
+    [XmlElement("epost", IsNullable = true)]
     [JsonProperty("epost")]
     [JsonPropertyName("epost")]
     public string epost { get; set; }
@@ -543,32 +543,32 @@ public class PartType
 
   public class EnkelAdresseType
   {
-    [XmlElement("adresselinje1")]
+    [XmlElement("adresselinje1", IsNullable = true)]
     [JsonProperty("adresselinje1")]
     [JsonPropertyName("adresselinje1")]
     public string adresselinje1 { get; set; }
 
-    [XmlElement("adresselinje2")]
+    [XmlElement("adresselinje2", IsNullable = true)]
     [JsonProperty("adresselinje2")]
     [JsonPropertyName("adresselinje2")]
     public string adresselinje2 { get; set; }
 
-    [XmlElement("adresselinje3")]
+    [XmlElement("adresselinje3", IsNullable = true)]
     [JsonProperty("adresselinje3")]
     [JsonPropertyName("adresselinje3")]
     public string adresselinje3 { get; set; }
 
-    [XmlElement("postnr")]
+    [XmlElement("postnr", IsNullable = true)]
     [JsonProperty("postnr")]
     [JsonPropertyName("postnr")]
     public string postnr { get; set; }
 
-    [XmlElement("poststed")]
+    [XmlElement("poststed", IsNullable = true)]
     [JsonProperty("poststed")]
     [JsonPropertyName("poststed")]
     public string poststed { get; set; }
 
-    [XmlElement("landkode")]
+    [XmlElement("landkode", IsNullable = true)]
     [JsonProperty("landkode")]
     [JsonPropertyName("landkode")]
     public string landkode { get; set; }
@@ -577,22 +577,22 @@ public class EnkelAdresseType
 
   public class KontaktpersonType
   {
-    [XmlElement("navn")]
+    [XmlElement("navn", IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
 
-    [XmlElement("telefonnummer")]
+    [XmlElement("telefonnummer", IsNullable = true)]
     [JsonProperty("telefonnummer")]
     [JsonPropertyName("telefonnummer")]
     public string telefonnummer { get; set; }
 
-    [XmlElement("mobilnummer")]
+    [XmlElement("mobilnummer", IsNullable = true)]
     [JsonProperty("mobilnummer")]
     [JsonPropertyName("mobilnummer")]
     public string mobilnummer { get; set; }
 
-    [XmlElement("epost")]
+    [XmlElement("epost", IsNullable = true)]
     [JsonProperty("epost")]
     [JsonPropertyName("epost")]
     public string epost { get; set; }
diff --git a/testdata/Model/CSharp/XsAll/midlertidigbrukstillatelse/v4/midlertidigbrukstillatelse.cs b/testdata/Model/CSharp/XsAll/midlertidigbrukstillatelse/v4/midlertidigbrukstillatelse.cs
index 3a1deb36cc8..feaaea985c9 100644
--- a/testdata/Model/CSharp/XsAll/midlertidigbrukstillatelse/v4/midlertidigbrukstillatelse.cs
+++ b/testdata/Model/CSharp/XsAll/midlertidigbrukstillatelse/v4/midlertidigbrukstillatelse.cs
@@ -70,7 +70,7 @@ public class MidlertidigBrukstillatelseType
     public PartType ansvarligSoeker { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("datoFerdigattest")]
+    [XmlElement("datoFerdigattest", IsNullable = true)]
     [JsonProperty("datoFerdigattest")]
     [JsonPropertyName("datoFerdigattest")]
     public string datoFerdigattest { get; set; }
@@ -121,17 +121,17 @@ public class EiendomType
     [JsonPropertyName("adresse")]
     public EiendommensAdresseType adresse { get; set; }
 
-    [XmlElement("bygningsnummer")]
+    [XmlElement("bygningsnummer", IsNullable = true)]
     [JsonProperty("bygningsnummer")]
     [JsonPropertyName("bygningsnummer")]
     public string bygningsnummer { get; set; }
 
-    [XmlElement("bolignummer")]
+    [XmlElement("bolignummer", IsNullable = true)]
     [JsonProperty("bolignummer")]
     [JsonPropertyName("bolignummer")]
     public string bolignummer { get; set; }
 
-    [XmlElement("kommunenavn")]
+    [XmlElement("kommunenavn", IsNullable = true)]
     [JsonProperty("kommunenavn")]
     [JsonPropertyName("kommunenavn")]
     public string kommunenavn { get; set; }
@@ -140,7 +140,7 @@ public class EiendomType
 
   public class MatrikkelnummerType
   {
-    [XmlElement("kommunenummer")]
+    [XmlElement("kommunenummer", IsNullable = true)]
     [JsonProperty("kommunenummer")]
     [JsonPropertyName("kommunenummer")]
     public string kommunenummer { get; set; }
@@ -173,47 +173,47 @@ public class MatrikkelnummerType
 
   public class EiendommensAdresseType
   {
-    [XmlElement("adresselinje1")]
+    [XmlElement("adresselinje1", IsNullable = true)]
     [JsonProperty("adresselinje1")]
     [JsonPropertyName("adresselinje1")]
     public string adresselinje1 { get; set; }
 
-    [XmlElement("adresselinje2")]
+    [XmlElement("adresselinje2", IsNullable = true)]
     [JsonProperty("adresselinje2")]
     [JsonPropertyName("adresselinje2")]
     public string adresselinje2 { get; set; }
 
-    [XmlElement("adresselinje3")]
+    [XmlElement("adresselinje3", IsNullable = true)]
     [JsonProperty("adresselinje3")]
     [JsonPropertyName("adresselinje3")]
     public string adresselinje3 { get; set; }
 
-    [XmlElement("postnr")]
+    [XmlElement("postnr", IsNullable = true)]
     [JsonProperty("postnr")]
     [JsonPropertyName("postnr")]
     public string postnr { get; set; }
 
-    [XmlElement("poststed")]
+    [XmlElement("poststed", IsNullable = true)]
     [JsonProperty("poststed")]
     [JsonPropertyName("poststed")]
     public string poststed { get; set; }
 
-    [XmlElement("landkode")]
+    [XmlElement("landkode", IsNullable = true)]
     [JsonProperty("landkode")]
     [JsonPropertyName("landkode")]
     public string landkode { get; set; }
 
-    [XmlElement("gatenavn")]
+    [XmlElement("gatenavn", IsNullable = true)]
     [JsonProperty("gatenavn")]
     [JsonPropertyName("gatenavn")]
     public string gatenavn { get; set; }
 
-    [XmlElement("husnr")]
+    [XmlElement("husnr", IsNullable = true)]
     [JsonProperty("husnr")]
     [JsonPropertyName("husnr")]
     public string husnr { get; set; }
 
-    [XmlElement("bokstav")]
+    [XmlElement("bokstav", IsNullable = true)]
     [JsonProperty("bokstav")]
     [JsonPropertyName("bokstav")]
     public string bokstav { get; set; }
@@ -238,22 +238,22 @@ public class SaksnummerType
 
   public class MetadataType
   {
-    [XmlElement("fraSluttbrukersystem")]
+    [XmlElement("fraSluttbrukersystem", IsNullable = true)]
     [JsonProperty("fraSluttbrukersystem")]
     [JsonPropertyName("fraSluttbrukersystem")]
     public string fraSluttbrukersystem { get; set; }
 
-    [XmlElement("ftbId")]
+    [XmlElement("ftbId", IsNullable = true)]
     [JsonProperty("ftbId")]
     [JsonPropertyName("ftbId")]
     public string ftbId { get; set; }
 
-    [XmlElement("prosjektnavn")]
+    [XmlElement("prosjektnavn", IsNullable = true)]
     [JsonProperty("prosjektnavn")]
     [JsonPropertyName("prosjektnavn")]
     public string prosjektnavn { get; set; }
 
-    [XmlElement("prosjektnr")]
+    [XmlElement("prosjektnr", IsNullable = true)]
     [JsonProperty("prosjektnr")]
     [JsonPropertyName("prosjektnr")]
     public string prosjektnr { get; set; }
@@ -275,12 +275,12 @@ public class KodeType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("kodeverdi")]
+    [XmlElement("kodeverdi", IsNullable = true)]
     [JsonProperty("kodeverdi")]
     [JsonPropertyName("kodeverdi")]
     public string kodeverdi { get; set; }
 
-    [XmlElement("kodebeskrivelse")]
+    [XmlElement("kodebeskrivelse", IsNullable = true)]
     [JsonProperty("kodebeskrivelse")]
     [JsonPropertyName("kodebeskrivelse")]
     public string kodebeskrivelse { get; set; }
@@ -303,7 +303,7 @@ public class SoeknadGjelderType
     [JsonPropertyName("gjelderHeleTiltaket")]
     public bool? gjelderHeleTiltaket { get; set; }
 
-    [XmlElement("delAvTiltaket")]
+    [XmlElement("delAvTiltaket", IsNullable = true)]
     [JsonProperty("delAvTiltaket")]
     [JsonPropertyName("delAvTiltaket")]
     public string delAvTiltaket { get; set; }
@@ -313,12 +313,12 @@ public class SoeknadGjelderType
     [JsonPropertyName("type")]
     public KodeListe type { get; set; }
 
-    [XmlElement("delsoeknadsnummer")]
+    [XmlElement("delsoeknadsnummer", IsNullable = true)]
     [JsonProperty("delsoeknadsnummer")]
     [JsonPropertyName("delsoeknadsnummer")]
     public string delsoeknadsnummer { get; set; }
 
-    [XmlElement("foelgebrev")]
+    [XmlElement("foelgebrev", IsNullable = true)]
     [JsonProperty("foelgebrev")]
     [JsonPropertyName("foelgebrev")]
     public string foelgebrev { get; set; }
@@ -353,18 +353,18 @@ public class DelsoeknadType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("delAvTiltaket")]
+    [XmlElement("delAvTiltaket", IsNullable = true)]
     [JsonProperty("delAvTiltaket")]
     [JsonPropertyName("delAvTiltaket")]
     public string delAvTiltaket { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("tillatelsedato")]
+    [XmlElement("tillatelsedato", IsNullable = true)]
     [JsonProperty("tillatelsedato")]
     [JsonPropertyName("tillatelsedato")]
     public string tillatelsedato { get; set; }
 
-    [XmlElement("kommentar")]
+    [XmlElement("kommentar", IsNullable = true)]
     [JsonProperty("kommentar")]
     [JsonPropertyName("kommentar")]
     public string kommentar { get; set; }
@@ -374,7 +374,7 @@ public class DelsoeknadType
     [JsonPropertyName("type")]
     public KodeListe type { get; set; }
 
-    [XmlElement("delsoeknadsnummer")]
+    [XmlElement("delsoeknadsnummer", IsNullable = true)]
     [JsonProperty("delsoeknadsnummer")]
     [JsonPropertyName("delsoeknadsnummer")]
     public string delsoeknadsnummer { get; set; }
@@ -400,7 +400,7 @@ public class UtfallSvarType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("utfallId")]
+    [XmlElement("utfallId", IsNullable = true)]
     [JsonProperty("utfallId")]
     [JsonPropertyName("utfallId")]
     public string utfallId { get; set; }
@@ -420,12 +420,12 @@ public class UtfallSvarType
     [JsonPropertyName("tema")]
     public KodeType tema { get; set; }
 
-    [XmlElement("tittel")]
+    [XmlElement("tittel", IsNullable = true)]
     [JsonProperty("tittel")]
     [JsonPropertyName("tittel")]
     public string tittel { get; set; }
 
-    [XmlElement("beskrivelse")]
+    [XmlElement("beskrivelse", IsNullable = true)]
     [JsonProperty("beskrivelse")]
     [JsonPropertyName("beskrivelse")]
     public string beskrivelse { get; set; }
@@ -440,7 +440,7 @@ public class UtfallSvarType
     [JsonPropertyName("erUtfallBesvart")]
     public bool? erUtfallBesvart { get; set; }
 
-    [XmlElement("kommentar")]
+    [XmlElement("kommentar", IsNullable = true)]
     [JsonProperty("kommentar")]
     [JsonPropertyName("kommentar")]
     public string kommentar { get; set; }
@@ -454,12 +454,12 @@ public class UtfallSvarType
 
   public class SjekkpunktType
   {
-    [XmlElement("sjekkpunktId")]
+    [XmlElement("sjekkpunktId", IsNullable = true)]
     [JsonProperty("sjekkpunktId")]
     [JsonPropertyName("sjekkpunktId")]
     public string sjekkpunktId { get; set; }
 
-    [XmlElement("sjekkpunktEier")]
+    [XmlElement("sjekkpunktEier", IsNullable = true)]
     [JsonProperty("sjekkpunktEier")]
     [JsonPropertyName("sjekkpunktEier")]
     public string sjekkpunktEier { get; set; }
@@ -485,7 +485,7 @@ public class VedleggType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("versjonsnummer")]
+    [XmlElement("versjonsnummer", IsNullable = true)]
     [JsonProperty("versjonsnummer")]
     [JsonPropertyName("versjonsnummer")]
     public string versjonsnummer { get; set; }
@@ -496,12 +496,12 @@ public class VedleggType
     public KodeType vedleggstype { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("versjonsdato")]
+    [XmlElement("versjonsdato", IsNullable = true)]
     [JsonProperty("versjonsdato")]
     [JsonPropertyName("versjonsdato")]
     public string versjonsdato { get; set; }
 
-    [XmlElement("filnavn")]
+    [XmlElement("filnavn", IsNullable = true)]
     [JsonProperty("filnavn")]
     [JsonPropertyName("filnavn")]
     public string filnavn { get; set; }
@@ -515,17 +515,17 @@ public class PartType
     [JsonPropertyName("partstype")]
     public KodeType partstype { get; set; }
 
-    [XmlElement("foedselsnummer")]
+    [XmlElement("foedselsnummer", IsNullable = true)]
     [JsonProperty("foedselsnummer")]
     [JsonPropertyName("foedselsnummer")]
     public string foedselsnummer { get; set; }
 
-    [XmlElement("organisasjonsnummer")]
+    [XmlElement("organisasjonsnummer", IsNullable = true)]
     [JsonProperty("organisasjonsnummer")]
     [JsonPropertyName("organisasjonsnummer")]
     public string organisasjonsnummer { get; set; }
 
-    [XmlElement("navn")]
+    [XmlElement("navn", IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
@@ -535,17 +535,17 @@ public class PartType
     [JsonPropertyName("adresse")]
     public EnkelAdresseType adresse { get; set; }
 
-    [XmlElement("telefonnummer")]
+    [XmlElement("telefonnummer", IsNullable = true)]
     [JsonProperty("telefonnummer")]
     [JsonPropertyName("telefonnummer")]
     public string telefonnummer { get; set; }
 
-    [XmlElement("mobilnummer")]
+    [XmlElement("mobilnummer", IsNullable = true)]
     [JsonProperty("mobilnummer")]
     [JsonPropertyName("mobilnummer")]
     public string mobilnummer { get; set; }
 
-    [XmlElement("epost")]
+    [XmlElement("epost", IsNullable = true)]
     [JsonProperty("epost")]
     [JsonPropertyName("epost")]
     public string epost { get; set; }
@@ -559,32 +559,32 @@ public class PartType
 
   public class EnkelAdresseType
   {
-    [XmlElement("adresselinje1")]
+    [XmlElement("adresselinje1", IsNullable = true)]
     [JsonProperty("adresselinje1")]
     [JsonPropertyName("adresselinje1")]
     public string adresselinje1 { get; set; }
 
-    [XmlElement("adresselinje2")]
+    [XmlElement("adresselinje2", IsNullable = true)]
     [JsonProperty("adresselinje2")]
     [JsonPropertyName("adresselinje2")]
     public string adresselinje2 { get; set; }
 
-    [XmlElement("adresselinje3")]
+    [XmlElement("adresselinje3", IsNullable = true)]
     [JsonProperty("adresselinje3")]
     [JsonPropertyName("adresselinje3")]
     public string adresselinje3 { get; set; }
 
-    [XmlElement("postnr")]
+    [XmlElement("postnr", IsNullable = true)]
     [JsonProperty("postnr")]
     [JsonPropertyName("postnr")]
     public string postnr { get; set; }
 
-    [XmlElement("poststed")]
+    [XmlElement("poststed", IsNullable = true)]
     [JsonProperty("poststed")]
     [JsonPropertyName("poststed")]
     public string poststed { get; set; }
 
-    [XmlElement("landkode")]
+    [XmlElement("landkode", IsNullable = true)]
     [JsonProperty("landkode")]
     [JsonPropertyName("landkode")]
     public string landkode { get; set; }
@@ -593,22 +593,22 @@ public class EnkelAdresseType
 
   public class KontaktpersonType
   {
-    [XmlElement("navn")]
+    [XmlElement("navn", IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
 
-    [XmlElement("telefonnummer")]
+    [XmlElement("telefonnummer", IsNullable = true)]
     [JsonProperty("telefonnummer")]
     [JsonPropertyName("telefonnummer")]
     public string telefonnummer { get; set; }
 
-    [XmlElement("mobilnummer")]
+    [XmlElement("mobilnummer", IsNullable = true)]
     [JsonProperty("mobilnummer")]
     [JsonPropertyName("mobilnummer")]
     public string mobilnummer { get; set; }
 
-    [XmlElement("epost")]
+    [XmlElement("epost", IsNullable = true)]
     [JsonProperty("epost")]
     [JsonPropertyName("epost")]
     public string epost { get; set; }
@@ -617,12 +617,12 @@ public class KontaktpersonType
 
   public class GjenstaaendeArbeiderType
   {
-    [XmlElement("gjenstaaendeInnenfor")]
+    [XmlElement("gjenstaaendeInnenfor", IsNullable = true)]
     [JsonProperty("gjenstaaendeInnenfor")]
     [JsonPropertyName("gjenstaaendeInnenfor")]
     public string gjenstaaendeInnenfor { get; set; }
 
-    [XmlElement("gjenstaaendeUtenfor")]
+    [XmlElement("gjenstaaendeUtenfor", IsNullable = true)]
     [JsonProperty("gjenstaaendeUtenfor")]
     [JsonPropertyName("gjenstaaendeUtenfor")]
     public string gjenstaaendeUtenfor { get; set; }
@@ -636,19 +636,19 @@ public class SikkerhetsnivaaType
     [JsonPropertyName("harTilstrekkeligSikkerhet")]
     public bool? harTilstrekkeligSikkerhet { get; set; }
 
-    [XmlElement("typeArbeider")]
+    [XmlElement("typeArbeider", IsNullable = true)]
     [JsonProperty("typeArbeider")]
     [JsonPropertyName("typeArbeider")]
     public string typeArbeider { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("utfoertInnen")]
+    [XmlElement("utfoertInnen", IsNullable = true)]
     [JsonProperty("utfoertInnen")]
     [JsonPropertyName("utfoertInnen")]
     public string utfoertInnen { get; set; }
 
     [RegularExpression(@"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$")]
-    [XmlElement("bekreftelseInnen")]
+    [XmlElement("bekreftelseInnen", IsNullable = true)]
     [JsonProperty("bekreftelseInnen")]
     [JsonPropertyName("bekreftelseInnen")]
     public string bekreftelseInnen { get; set; }
diff --git a/testdata/Model/CSharp/XsAll/planvarsel/v2/planvarsel.cs b/testdata/Model/CSharp/XsAll/planvarsel/v2/planvarsel.cs
index 301bd919468..ebacd19f4e9 100644
--- a/testdata/Model/CSharp/XsAll/planvarsel/v2/planvarsel.cs
+++ b/testdata/Model/CSharp/XsAll/planvarsel/v2/planvarsel.cs
@@ -34,7 +34,7 @@ public class PlanvarselType
     [JsonPropertyName("beroerteParter")]
     public BeroertPartListe beroerteParter { get; set; }
 
-    [XmlElement("kommunenavn")]
+    [XmlElement("kommunenavn", IsNullable = true)]
     [JsonProperty("kommunenavn")]
     [JsonPropertyName("kommunenavn")]
     public string kommunenavn { get; set; }
@@ -78,22 +78,22 @@ public class PartType
     [JsonPropertyName("partstype")]
     public KodeType partstype { get; set; }
 
-    [XmlElement("foedselsnummer")]
+    [XmlElement("foedselsnummer", IsNullable = true)]
     [JsonProperty("foedselsnummer")]
     [JsonPropertyName("foedselsnummer")]
     public string foedselsnummer { get; set; }
 
-    [XmlElement("organisasjonsnummer")]
+    [XmlElement("organisasjonsnummer", IsNullable = true)]
     [JsonProperty("organisasjonsnummer")]
     [JsonPropertyName("organisasjonsnummer")]
     public string organisasjonsnummer { get; set; }
 
-    [XmlElement("navn")]
+    [XmlElement("navn", IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
 
-    [XmlElement("epost")]
+    [XmlElement("epost", IsNullable = true)]
     [JsonProperty("epost")]
     [JsonPropertyName("epost")]
     public string epost { get; set; }
@@ -103,7 +103,7 @@ public class PartType
     [JsonPropertyName("adresse")]
     public EnkelAdresseType adresse { get; set; }
 
-    [XmlElement("telefon")]
+    [XmlElement("telefon", IsNullable = true)]
     [JsonProperty("telefon")]
     [JsonPropertyName("telefon")]
     public string telefon { get; set; }
@@ -112,12 +112,12 @@ public class PartType
 
   public class KodeType
   {
-    [XmlElement("kodeverdi")]
+    [XmlElement("kodeverdi", IsNullable = true)]
     [JsonProperty("kodeverdi")]
     [JsonPropertyName("kodeverdi")]
     public string kodeverdi { get; set; }
 
-    [XmlElement("kodebeskrivelse")]
+    [XmlElement("kodebeskrivelse", IsNullable = true)]
     [JsonProperty("kodebeskrivelse")]
     [JsonPropertyName("kodebeskrivelse")]
     public string kodebeskrivelse { get; set; }
@@ -126,32 +126,32 @@ public class KodeType
 
   public class EnkelAdresseType
   {
-    [XmlElement("adresselinje1")]
+    [XmlElement("adresselinje1", IsNullable = true)]
     [JsonProperty("adresselinje1")]
     [JsonPropertyName("adresselinje1")]
     public string adresselinje1 { get; set; }
 
-    [XmlElement("adresselinje2")]
+    [XmlElement("adresselinje2", IsNullable = true)]
     [JsonProperty("adresselinje2")]
     [JsonPropertyName("adresselinje2")]
     public string adresselinje2 { get; set; }
 
-    [XmlElement("adresselinje3")]
+    [XmlElement("adresselinje3", IsNullable = true)]
     [JsonProperty("adresselinje3")]
     [JsonPropertyName("adresselinje3")]
     public string adresselinje3 { get; set; }
 
-    [XmlElement("postnr")]
+    [XmlElement("postnr", IsNullable = true)]
     [JsonProperty("postnr")]
     [JsonPropertyName("postnr")]
     public string postnr { get; set; }
 
-    [XmlElement("poststed")]
+    [XmlElement("poststed", IsNullable = true)]
     [JsonProperty("poststed")]
     [JsonPropertyName("poststed")]
     public string poststed { get; set; }
 
-    [XmlElement("landkode")]
+    [XmlElement("landkode", IsNullable = true)]
     [JsonProperty("landkode")]
     [JsonPropertyName("landkode")]
     public string landkode { get; set; }
@@ -182,27 +182,27 @@ public class BeroertPartType
     [JsonPropertyName("partstype")]
     public KodeType partstype { get; set; }
 
-    [XmlElement("foedselsnummer")]
+    [XmlElement("foedselsnummer", IsNullable = true)]
     [JsonProperty("foedselsnummer")]
     [JsonPropertyName("foedselsnummer")]
     public string foedselsnummer { get; set; }
 
-    [XmlElement("organisasjonsnummer")]
+    [XmlElement("organisasjonsnummer", IsNullable = true)]
     [JsonProperty("organisasjonsnummer")]
     [JsonPropertyName("organisasjonsnummer")]
     public string organisasjonsnummer { get; set; }
 
-    [XmlElement("navn")]
+    [XmlElement("navn", IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
 
-    [XmlElement("telefon")]
+    [XmlElement("telefon", IsNullable = true)]
     [JsonProperty("telefon")]
     [JsonPropertyName("telefon")]
     public string telefon { get; set; }
 
-    [XmlElement("epost")]
+    [XmlElement("epost", IsNullable = true)]
     [JsonProperty("epost")]
     [JsonPropertyName("epost")]
     public string epost { get; set; }
@@ -212,12 +212,12 @@ public class BeroertPartType
     [JsonPropertyName("adresse")]
     public EnkelAdresseType adresse { get; set; }
 
-    [XmlElement("beskrivelseForVarsel")]
+    [XmlElement("beskrivelseForVarsel", IsNullable = true)]
     [JsonProperty("beskrivelseForVarsel")]
     [JsonPropertyName("beskrivelseForVarsel")]
     public string beskrivelseForVarsel { get; set; }
 
-    [XmlElement("systemReferanse")]
+    [XmlElement("systemReferanse", IsNullable = true)]
     [JsonProperty("systemReferanse")]
     [JsonPropertyName("systemReferanse")]
     public string systemReferanse { get; set; }
@@ -263,17 +263,17 @@ public class EiendomType
     [JsonPropertyName("adresse")]
     public EiendommensAdresseType adresse { get; set; }
 
-    [XmlElement("bygningsnummer")]
+    [XmlElement("bygningsnummer", IsNullable = true)]
     [JsonProperty("bygningsnummer")]
     [JsonPropertyName("bygningsnummer")]
     public string bygningsnummer { get; set; }
 
-    [XmlElement("bolignummer")]
+    [XmlElement("bolignummer", IsNullable = true)]
     [JsonProperty("bolignummer")]
     [JsonPropertyName("bolignummer")]
     public string bolignummer { get; set; }
 
-    [XmlElement("kommunenavn")]
+    [XmlElement("kommunenavn", IsNullable = true)]
     [JsonProperty("kommunenavn")]
     [JsonPropertyName("kommunenavn")]
     public string kommunenavn { get; set; }
@@ -282,7 +282,7 @@ public class EiendomType
 
   public class MatrikkelnummerType
   {
-    [XmlElement("kommunenummer")]
+    [XmlElement("kommunenummer", IsNullable = true)]
     [JsonProperty("kommunenummer")]
     [JsonPropertyName("kommunenummer")]
     public string kommunenummer { get; set; }
@@ -315,47 +315,47 @@ public class MatrikkelnummerType
 
   public class EiendommensAdresseType
   {
-    [XmlElement("adresselinje1")]
+    [XmlElement("adresselinje1", IsNullable = true)]
     [JsonProperty("adresselinje1")]
     [JsonPropertyName("adresselinje1")]
     public string adresselinje1 { get; set; }
 
-    [XmlElement("adresselinje2")]
+    [XmlElement("adresselinje2", IsNullable = true)]
     [JsonProperty("adresselinje2")]
     [JsonPropertyName("adresselinje2")]
     public string adresselinje2 { get; set; }
 
-    [XmlElement("adresselinje3")]
+    [XmlElement("adresselinje3", IsNullable = true)]
     [JsonProperty("adresselinje3")]
     [JsonPropertyName("adresselinje3")]
     public string adresselinje3 { get; set; }
 
-    [XmlElement("postnr")]
+    [XmlElement("postnr", IsNullable = true)]
     [JsonProperty("postnr")]
     [JsonPropertyName("postnr")]
     public string postnr { get; set; }
 
-    [XmlElement("poststed")]
+    [XmlElement("poststed", IsNullable = true)]
     [JsonProperty("poststed")]
     [JsonPropertyName("poststed")]
     public string poststed { get; set; }
 
-    [XmlElement("landkode")]
+    [XmlElement("landkode", IsNullable = true)]
     [JsonProperty("landkode")]
     [JsonPropertyName("landkode")]
     public string landkode { get; set; }
 
-    [XmlElement("gatenavn")]
+    [XmlElement("gatenavn", IsNullable = true)]
     [JsonProperty("gatenavn")]
     [JsonPropertyName("gatenavn")]
     public string gatenavn { get; set; }
 
-    [XmlElement("husnr")]
+    [XmlElement("husnr", IsNullable = true)]
     [JsonProperty("husnr")]
     [JsonPropertyName("husnr")]
     public string husnr { get; set; }
 
-    [XmlElement("bokstav")]
+    [XmlElement("bokstav", IsNullable = true)]
     [JsonProperty("bokstav")]
     [JsonPropertyName("bokstav")]
     public string bokstav { get; set; }
@@ -378,12 +378,12 @@ public class SignaturType
     [JsonPropertyName("signaturdato")]
     public DateTime? signaturdato { get; set; }
 
-    [XmlElement("signertAv")]
+    [XmlElement("signertAv", IsNullable = true)]
     [JsonProperty("signertAv")]
     [JsonPropertyName("signertAv")]
     public string signertAv { get; set; }
 
-    [XmlElement("signertPaaVegneAv")]
+    [XmlElement("signertPaaVegneAv", IsNullable = true)]
     [JsonProperty("signertPaaVegneAv")]
     [JsonPropertyName("signertPaaVegneAv")]
     public string signertPaaVegneAv { get; set; }
@@ -409,7 +409,7 @@ public class GjeldendePlanType
 
     public bool ShouldSerializeAltinnRowId() => AltinnRowId != default;
 
-    [XmlElement("navn")]
+    [XmlElement("navn", IsNullable = true)]
     [JsonProperty("navn")]
     [JsonPropertyName("navn")]
     public string navn { get; set; }
@@ -423,12 +423,12 @@ public class GjeldendePlanType
 
   public class MetadataType
   {
-    [XmlElement("ftbId")]
+    [XmlElement("ftbId", IsNullable = true)]
     [JsonProperty("ftbId")]
     [JsonPropertyName("ftbId")]
     public string ftbId { get; set; }
 
-    [XmlElement("hovedinnsendingsnummer")]
+    [XmlElement("hovedinnsendingsnummer", IsNullable = true)]
     [JsonProperty("hovedinnsendingsnummer")]
     [JsonPropertyName("hovedinnsendingsnummer")]
     public string hovedinnsendingsnummer { get; set; }
@@ -438,7 +438,7 @@ public class MetadataType
     [JsonPropertyName("klartForSigneringFraSluttbrukersystem")]
     public bool? klartForSigneringFraSluttbrukersystem { get; set; }
 
-    [XmlElement("fraSluttbrukersystem")]
+    [XmlElement("fraSluttbrukersystem", IsNullable = true)]
     [JsonProperty("fraSluttbrukersystem")]
     [JsonPropertyName("fraSluttbrukersystem")]
     public string fraSluttbrukersystem { get; set; }
@@ -447,17 +447,17 @@ public class MetadataType
 
   public class PlanType
   {
-    [XmlElement("plannavn")]
+    [XmlElement("plannavn", IsNullable = true)]
     [JsonProperty("plannavn")]
     [JsonPropertyName("plannavn")]
     public string plannavn { get; set; }
 
-    [XmlElement("arealplanId")]
+    [XmlElement("arealplanId", IsNullable = true)]
     [JsonProperty("arealplanId")]
     [JsonPropertyName("arealplanId")]
     public string arealplanId { get; set; }
 
-    [XmlElement("hjemmesidePlanforslag")]
+    [XmlElement("hjemmesidePlanforslag", IsNullable = true)]
     [JsonProperty("hjemmesidePlanforslag")]
     [JsonPropertyName("hjemmesidePlanforslag")]
     public string hjemmesidePlanforslag { get; set; }
@@ -467,7 +467,7 @@ public class PlanType
     [JsonPropertyName("kravKonsekvensUtredning")]
     public bool? kravKonsekvensUtredning { get; set; }
 
-    [XmlElement("planHensikt")]
+    [XmlElement("planHensikt", IsNullable = true)]
     [JsonProperty("planHensikt")]
     [JsonPropertyName("planHensikt")]
     public string planHensikt { get; set; }
@@ -477,7 +477,7 @@ public class PlanType
     [JsonPropertyName("fristForInnspill")]
     public DateTime? fristForInnspill { get; set; }
 
-    [XmlElement("hjemmesidePlanprogram")]
+    [XmlElement("hjemmesidePlanprogram", IsNullable = true)]
     [JsonProperty("hjemmesidePlanprogram")]
     [JsonPropertyName("hjemmesidePlanprogram")]
     public string hjemmesidePlanprogram { get; set; }
@@ -487,7 +487,7 @@ public class PlanType
     [JsonPropertyName("plantype")]
     public KodeType plantype { get; set; }
 
-    [XmlElement("begrunnelseKU")]
+    [XmlElement("begrunnelseKU", IsNullable = true)]
     [JsonProperty("begrunnelseKU")]
     [JsonPropertyName("begrunnelseKU")]
     public string begrunnelseKU { get; set; }
@@ -497,7 +497,7 @@ public class PlanType
     [JsonPropertyName("kommunensSaksnummer")]
     public SaksnummerType kommunensSaksnummer { get; set; }
 
-    [XmlElement("saksgangOgMedvirkning")]
+    [XmlElement("saksgangOgMedvirkning", IsNullable = true)]
     [JsonProperty("saksgangOgMedvirkning")]
     [JsonPropertyName("saksgangOgMedvirkning")]
     public string saksgangOgMedvirkning { get; set; }
diff --git a/testdata/Model/Xml/XsAll/xsall-example-nillable-sample.xml b/testdata/Model/Xml/XsAll/xsall-example-nillable-sample.xml
new file mode 100644
index 00000000000..f2d4f8078f7
--- /dev/null
+++ b/testdata/Model/Xml/XsAll/xsall-example-nillable-sample.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <refElement xsi:nil="true" />
+</root>
diff --git a/testdata/Model/XmlSchema/XsAll/xsall-example.xsd b/testdata/Model/XmlSchema/XsAll/xsall-example.xsd
new file mode 100644
index 00000000000..e7d09bb3df5
--- /dev/null
+++ b/testdata/Model/XmlSchema/XsAll/xsall-example.xsd
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<xsd:schema attributeFormDefault="unqualified"
+            elementFormDefault="qualified"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <xsd:element name="root" type="SampleType" />
+
+  <xsd:complexType name="SampleType">
+    <xsd:all>
+      <xsd:element name="refElement" type="xsd:string" nillable="true" minOccurs="0" maxOccurs="1"/>
+    </xsd:all>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/yarn.lock b/yarn.lock
index 55270421956..9fef6beccf7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3954,15 +3954,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/csf@npm:^0.0.1":
-  version: 0.0.1
-  resolution: "@storybook/csf@npm:0.0.1"
-  dependencies:
-    lodash: "npm:^4.17.15"
-  checksum: 10/f6bb019bccd8abc14e45a85258158b7bd8cc525887ac8dc9151ed8c4908be3b5f5523da8a7a9b96ff11b13b6c1744e1a0e070560d63d836b950f595f9a5719d4
-  languageName: node
-  linkType: hard
-
 "@storybook/csf@npm:^0.1.11":
   version: 0.1.11
   resolution: "@storybook/csf@npm:0.1.11"
@@ -4184,7 +4175,7 @@ __metadata:
     "@types/jest": "npm:^29.5.5"
     ajv: "npm:8.17.1"
     eslint: "npm:8.57.1"
-    eslint-plugin-storybook: "npm:^0.9.0"
+    eslint-plugin-storybook: "npm:^0.11.0"
     jest: "npm:^29.7.0"
     jest-environment-jsdom: "npm:^29.7.0"
     react: "npm:^18.2.0"
@@ -4660,16 +4651,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/jest@npm:0.2.36":
-  version: 0.2.36
-  resolution: "@swc/jest@npm:0.2.36"
+"@swc/jest@npm:0.2.37":
+  version: 0.2.37
+  resolution: "@swc/jest@npm:0.2.37"
   dependencies:
     "@jest/create-cache-key-function": "npm:^29.7.0"
     "@swc/counter": "npm:^0.1.3"
     jsonc-parser: "npm:^3.2.0"
   peerDependencies:
     "@swc/core": "*"
-  checksum: 10/39c5699646f0e90400af106156e5604069e8a7d8216f2421e171837b086839176c16f69925ce6a5c4c48182005eed649bdf9664023708e169aa48814feecc0d8
+  checksum: 10/bbec37079b4f5c1ff1c95aeec07d08277c646a0c5e16e057ea3a8fe5c6e2bd59bbfc4312e53ddd05d25fa4de20a03607be274f560f28bb5e229dd08124780e16
   languageName: node
   linkType: hard
 
@@ -5527,16 +5518,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.62.0":
-  version: 5.62.0
-  resolution: "@typescript-eslint/scope-manager@npm:5.62.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:5.62.0"
-    "@typescript-eslint/visitor-keys": "npm:5.62.0"
-  checksum: 10/e827770baa202223bc0387e2fd24f630690809e460435b7dc9af336c77322290a770d62bd5284260fa881c86074d6a9fd6c97b07382520b115f6786b8ed499da
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/scope-manager@npm:7.18.0":
   version: 7.18.0
   resolution: "@typescript-eslint/scope-manager@npm:7.18.0"
@@ -5547,6 +5528,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:8.14.0":
+  version: 8.14.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.14.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.14.0"
+    "@typescript-eslint/visitor-keys": "npm:8.14.0"
+  checksum: 10/48ff44a790254b5a98c17bf15176fbdc1408b58eb3ccd8eda9c5707811786de25e1bccc5c490dcc05cbd34b685e162ee4e92b28f57b071c522274fa97f23c98c
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/type-utils@npm:7.18.0":
   version: 7.18.0
   resolution: "@typescript-eslint/type-utils@npm:7.18.0"
@@ -5571,13 +5562,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.62.0":
-  version: 5.62.0
-  resolution: "@typescript-eslint/types@npm:5.62.0"
-  checksum: 10/24e8443177be84823242d6729d56af2c4b47bfc664dd411a1d730506abf2150d6c31bdefbbc6d97c8f91043e3a50e0c698239dcb145b79bb6b0c34469aaf6c45
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/types@npm:7.18.0":
   version: 7.18.0
   resolution: "@typescript-eslint/types@npm:7.18.0"
@@ -5585,6 +5569,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:8.14.0":
+  version: 8.14.0
+  resolution: "@typescript-eslint/types@npm:8.14.0"
+  checksum: 10/1924aef8efdf5399d6cc9ef3a5307fda39b1a2be129ab8cb24a46dc0a37156230e77f2809ab709d5d0a43891b6ffd67ce45292724e8f8164ac19e1786c5f4644
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:5.59.2":
   version: 5.59.2
   resolution: "@typescript-eslint/typescript-estree@npm:5.59.2"
@@ -5603,32 +5594,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.62.0":
-  version: 5.62.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.62.0"
+"@typescript-eslint/typescript-estree@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.18.0"
   dependencies:
-    "@typescript-eslint/types": "npm:5.62.0"
-    "@typescript-eslint/visitor-keys": "npm:5.62.0"
+    "@typescript-eslint/types": "npm:7.18.0"
+    "@typescript-eslint/visitor-keys": "npm:7.18.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
-    semver: "npm:^7.3.7"
-    tsutils: "npm:^3.21.0"
+    minimatch: "npm:^9.0.4"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10/06c975eb5f44b43bd19fadc2e1023c50cf87038fe4c0dd989d4331c67b3ff509b17fa60a3251896668ab4d7322bdc56162a9926971218d2e1a1874d2bef9a52e
+  checksum: 10/b01e66235a91aa4439d02081d4a5f8b4a7cf9cb24f26b334812f657e3c603493e5f41e5c1e89cf4efae7d64509fa1f73affc16afc5e15cb7f83f724577c82036
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.18.0":
-  version: 7.18.0
-  resolution: "@typescript-eslint/typescript-estree@npm:7.18.0"
+"@typescript-eslint/typescript-estree@npm:8.14.0":
+  version: 8.14.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.14.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.18.0"
-    "@typescript-eslint/visitor-keys": "npm:7.18.0"
+    "@typescript-eslint/types": "npm:8.14.0"
+    "@typescript-eslint/visitor-keys": "npm:8.14.0"
     debug: "npm:^4.3.4"
-    globby: "npm:^11.1.0"
+    fast-glob: "npm:^3.3.2"
     is-glob: "npm:^4.0.3"
     minimatch: "npm:^9.0.4"
     semver: "npm:^7.6.0"
@@ -5636,7 +5628,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10/b01e66235a91aa4439d02081d4a5f8b4a7cf9cb24f26b334812f657e3c603493e5f41e5c1e89cf4efae7d64509fa1f73affc16afc5e15cb7f83f724577c82036
+  checksum: 10/b0b9f228071b6338dbf5e2ac52848fa6af630e8d84d4102e1cccaae67114f2bff82bd027af2818e3ad778668e3c3d4a2fb31b7f4c8a9796295e5aa87903fb313
   languageName: node
   linkType: hard
 
@@ -5672,21 +5664,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:^5.62.0":
-  version: 5.62.0
-  resolution: "@typescript-eslint/utils@npm:5.62.0"
+"@typescript-eslint/utils@npm:^8.8.1":
+  version: 8.14.0
+  resolution: "@typescript-eslint/utils@npm:8.14.0"
   dependencies:
-    "@eslint-community/eslint-utils": "npm:^4.2.0"
-    "@types/json-schema": "npm:^7.0.9"
-    "@types/semver": "npm:^7.3.12"
-    "@typescript-eslint/scope-manager": "npm:5.62.0"
-    "@typescript-eslint/types": "npm:5.62.0"
-    "@typescript-eslint/typescript-estree": "npm:5.62.0"
-    eslint-scope: "npm:^5.1.1"
-    semver: "npm:^7.3.7"
+    "@eslint-community/eslint-utils": "npm:^4.4.0"
+    "@typescript-eslint/scope-manager": "npm:8.14.0"
+    "@typescript-eslint/types": "npm:8.14.0"
+    "@typescript-eslint/typescript-estree": "npm:8.14.0"
   peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 10/15ef13e43998a082b15f85db979f8d3ceb1f9ce4467b8016c267b1738d5e7cdb12aa90faf4b4e6dd6486c236cf9d33c463200465cf25ff997dbc0f12358550a1
+    eslint: ^8.57.0 || ^9.0.0
+  checksum: 10/6d3b2583c473b452dd8f978524802aabd275055f98d461cc71ee6a9424291f4481d2a3416a3f77b2458939dd38a39c0fd8e0c9b47915141c8409e63528a1216b
   languageName: node
   linkType: hard
 
@@ -5700,16 +5688,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.62.0":
-  version: 5.62.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.62.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:5.62.0"
-    eslint-visitor-keys: "npm:^3.3.0"
-  checksum: 10/dc613ab7569df9bbe0b2ca677635eb91839dfb2ca2c6fa47870a5da4f160db0b436f7ec0764362e756d4164e9445d49d5eb1ff0b87f4c058946ae9d8c92eb388
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:7.18.0":
   version: 7.18.0
   resolution: "@typescript-eslint/visitor-keys@npm:7.18.0"
@@ -5720,6 +5698,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:8.14.0":
+  version: 8.14.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.14.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.14.0"
+    eslint-visitor-keys: "npm:^3.4.3"
+  checksum: 10/735cc9c2ce3235e543d03afe0de740022888e69ed9f5027564e1c959a3a087106bcf21b5b8d3ac872171c0a585744f0442b76fe6ba68341a735a4b4a15f52a46
+  languageName: node
+  linkType: hard
+
 "@ungap/structured-clone@npm:^1.0.0, @ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
@@ -6253,7 +6241,7 @@ __metadata:
     "@microsoft/signalr": "npm:8.0.7"
     "@svgr/webpack": "npm:8.1.0"
     "@swc/core": "npm:1.7.26"
-    "@swc/jest": "npm:0.2.36"
+    "@swc/jest": "npm:0.2.37"
     "@tanstack/react-query": "npm:5.59.0"
     "@tanstack/react-query-devtools": "npm:5.59.0"
     "@testing-library/dom": "npm:10.4.0"
@@ -9752,17 +9740,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-storybook@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "eslint-plugin-storybook@npm:0.9.0"
+"eslint-plugin-storybook@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "eslint-plugin-storybook@npm:0.11.0"
   dependencies:
-    "@storybook/csf": "npm:^0.0.1"
-    "@typescript-eslint/utils": "npm:^5.62.0"
-    requireindex: "npm:^1.2.0"
+    "@storybook/csf": "npm:^0.1.11"
+    "@typescript-eslint/utils": "npm:^8.8.1"
     ts-dedent: "npm:^2.2.0"
   peerDependencies:
     eslint: ">=6"
-  checksum: 10/5207e016cca6e095ddce911acfa12e973092fdc1ec716dfb54be70b859ac9be7ebde9ba6baa04a0e2fc4e34c772c4e9261d36a78c2cd5a873eeebf6087073b9f
+  checksum: 10/fb9b2a23add084d8184c20571ca4cfd099eda22ba465e3ecfc2c109317235209eabdd6b30a19cb5f352f70ddd8083e10cf82a38233dfe4d02b3b0f753f86a18b
   languageName: node
   linkType: hard
 
@@ -10224,6 +10211,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-glob@npm:^3.3.2":
+  version: 3.3.2
+  resolution: "fast-glob@npm:3.3.2"
+  dependencies:
+    "@nodelib/fs.stat": "npm:^2.0.2"
+    "@nodelib/fs.walk": "npm:^1.2.3"
+    glob-parent: "npm:^5.1.2"
+    merge2: "npm:^1.3.0"
+    micromatch: "npm:^4.0.4"
+  checksum: 10/222512e9315a0efca1276af9adb2127f02105d7288fa746145bf45e2716383fb79eb983c89601a72a399a56b7c18d38ce70457c5466218c5f13fad957cee16df
+  languageName: node
+  linkType: hard
+
 "fast-json-parse@npm:^1.0.3":
   version: 1.0.3
   resolution: "fast-json-parse@npm:1.0.3"
@@ -13336,7 +13336,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
+"lodash@npm:^4.17.20, lodash@npm:^4.17.21":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532
@@ -16126,13 +16126,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"requireindex@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "requireindex@npm:1.2.0"
-  checksum: 10/266d1cb31f6cbc4b6cf2e898f5bbc45581f7919bcf61bba5c45d0adb69b722b9ff5a13727be3350cde4520d7cd37f39df45d58a29854baaa4552cd6b05ae4a1a
-  languageName: node
-  linkType: hard
-
 "requires-port@npm:^1.0.0":
   version: 1.0.0
   resolution: "requires-port@npm:1.0.0"