diff --git a/src/Altinn.App.Api/Controllers/DataController.cs b/src/Altinn.App.Api/Controllers/DataController.cs
index 1f168beb5..b7ed4ecf2 100644
--- a/src/Altinn.App.Api/Controllers/DataController.cs
+++ b/src/Altinn.App.Api/Controllers/DataController.cs
@@ -7,8 +7,6 @@
 using Altinn.App.Core.Constants;
 using Altinn.App.Core.Extensions;
 using Altinn.App.Core.Features;
-using Altinn.App.Core.Features.FileAnalysis;
-using Altinn.App.Core.Features.FileAnalyzis;
 using Altinn.App.Core.Features.Validation;
 using Altinn.App.Core.Helpers;
 using Altinn.App.Core.Helpers.Serialization;
@@ -46,9 +44,8 @@ public class DataController : ControllerBase
         private readonly IAppResources _appResourcesService;
         private readonly IAppMetadata _appMetadata;
         private readonly IPrefill _prefillService;
-        private readonly IFileAnalysisService _fileAnalyserService;
-        private readonly IFileValidationService _fileValidationService;
         private readonly IFeatureManager _featureManager;
+        private readonly IValidationService _validationService;
         private const long REQUEST_SIZE_LIMIT = 2000 * 1024 * 1024;
 
         /// <summary>
@@ -64,8 +61,7 @@ public class DataController : ControllerBase
         /// <param name="appMetadata">The app metadata service</param>
         /// <param name="featureManager">The feature manager controlling enabled features.</param>
         /// <param name="prefillService">A service with prefill related logic.</param>
-        /// <param name="fileAnalyserService">Service used to analyse files uploaded.</param>
-        /// <param name="fileValidationService">Service used to validate files uploaded.</param>
+        /// <param name="validationService">Service used to validate files uploaded.</param>
         public DataController(
             ILogger<DataController> logger,
             IInstanceClient instanceClient,
@@ -75,10 +71,9 @@ public DataController(
             IAppModel appModel,
             IAppResources appResourcesService,
             IPrefill prefillService,
-            IFileAnalysisService fileAnalyserService,
-            IFileValidationService fileValidationService,
             IAppMetadata appMetadata,
-            IFeatureManager featureManager)
+            IFeatureManager featureManager,
+            IValidationService validationService)
         {
             _logger = logger;
 
@@ -90,9 +85,8 @@ public DataController(
             _appResourcesService = appResourcesService;
             _appMetadata = appMetadata;
             _prefillService = prefillService;
-            _fileAnalyserService = fileAnalyserService;
-            _fileValidationService = fileValidationService;
             _featureManager = featureManager;
+            _validationService = validationService;
         }
 
         /// <summary>
@@ -161,9 +155,8 @@ public async Task<ActionResult> Create(
 
                     StreamContent streamContent = Request.CreateContentStream();
 
-                    using Stream fileStream = new MemoryStream();
-                    await streamContent.CopyToAsync(fileStream);
-                    if (fileStream.Length == 0)
+                    var fileBytes = await streamContent.ReadAsByteArrayAsync();
+                    if (fileBytes.Length == 0)
                     {
                         const string errorMessage = "Invalid data provided. Error: The file is zero bytes.";
                         var error = new ValidationIssue
@@ -179,25 +172,14 @@ public async Task<ActionResult> Create(
                     bool parseSuccess = Request.Headers.TryGetValue("Content-Disposition", out StringValues headerValues);
                     string? filename = parseSuccess ? DataRestrictionValidation.GetFileNameFromHeader(headerValues) : null;
 
-                    IEnumerable<FileAnalysisResult> fileAnalysisResults = new List<FileAnalysisResult>();
-                    if (FileAnalysisEnabledForDataType(dataTypeFromMetadata))
-                    {
-                        fileAnalysisResults = await _fileAnalyserService.Analyse(dataTypeFromMetadata, fileStream, filename);
-                    }
-
-                    bool fileValidationSuccess = true;
-                    List<ValidationIssue> validationIssues = new();
-                    if (FileValidationEnabledForDataType(dataTypeFromMetadata))
-                    {
-                        (fileValidationSuccess, validationIssues) = await _fileValidationService.Validate(dataTypeFromMetadata, fileAnalysisResults);
-                    }
+                    var fileAnalysisResults = await _validationService.ValidateFileUpload(instance, dataTypeFromMetadata, fileBytes, filename);
 
-                    if (!fileValidationSuccess)
+                    if (!fileAnalysisResults.All(r => r.Severity is ValidationIssueSeverity.Informational or ValidationIssueSeverity.Fixed))
                     {
-                        return BadRequest(await GetErrorDetails(validationIssues));
+                        return BadRequest(await GetErrorDetails(fileAnalysisResults));
                     }
 
-                    fileStream.Seek(0, SeekOrigin.Begin);
+                    using var fileStream = new MemoryStream(fileBytes);
                     return await CreateBinaryData(instance, dataType, streamContent.Headers.ContentType.ToString(), filename, fileStream);
                 }
             }
@@ -220,16 +202,6 @@ private async Task<object> GetErrorDetails(List<ValidationIssue> errors)
             return await _featureManager.IsEnabledAsync(FeatureFlags.JsonObjectInDataResponse) ? errors : string.Join(";", errors.Select(x => x.Description));
         }
 
-        private static bool FileAnalysisEnabledForDataType(DataType dataTypeFromMetadata)
-        {
-            return dataTypeFromMetadata.EnabledFileAnalysers != null && dataTypeFromMetadata.EnabledFileAnalysers.Count > 0;
-        }
-
-        private static bool FileValidationEnabledForDataType(DataType dataTypeFromMetadata)
-        {
-            return dataTypeFromMetadata.EnabledFileValidators != null && dataTypeFromMetadata.EnabledFileValidators.Count > 0;
-        }
-
         /// <summary>
         /// Gets a data element from storage and applies business logic if nessesary.
         /// </summary>
@@ -296,6 +268,8 @@ public async Task<ActionResult> Get(
         /// <param name="dataGuid">unique id to identify the data element to update</param>
         /// <returns>The updated data element, including the changed fields in the event of a calculation that changed data.</returns>
         [Authorize(Policy = AuthzConstants.POLICY_INSTANCE_WRITE)]
+
+        // "{org}/{app}/instances/{instanceOwnerPartyId:int}/{instanceGuid:guid}/data/form/{dataGuid:guid}"
         [HttpPut("{dataGuid:guid}")]
         [DisableFormValueModelBinding]
         [RequestSizeLimit(REQUEST_SIZE_LIMIT)]
diff --git a/src/Altinn.App.Core/Extensions/ServiceCollectionExtensions.cs b/src/Altinn.App.Core/Extensions/ServiceCollectionExtensions.cs
index 378d01c54..a566d7921 100644
--- a/src/Altinn.App.Core/Extensions/ServiceCollectionExtensions.cs
+++ b/src/Altinn.App.Core/Extensions/ServiceCollectionExtensions.cs
@@ -4,7 +4,6 @@
 using Altinn.App.Core.Features.Action;
 using Altinn.App.Core.Features.DataLists;
 using Altinn.App.Core.Features.DataProcessing;
-using Altinn.App.Core.Features.FileAnalyzis;
 using Altinn.App.Core.Features.Options;
 using Altinn.App.Core.Features.PageOrder;
 using Altinn.App.Core.Features.Pdf;
@@ -163,8 +162,6 @@ public static void AddAppServices(this IServiceCollection services, IConfigurati
             AddPdfServices(services);
             AddEventServices(services);
             AddProcessServices(services);
-            AddFileAnalyserServices(services);
-            AddFileValidatorServices(services);
             AddMetricsDecorators(services, configuration);
 
             if (!env.IsDevelopment())
@@ -255,18 +252,6 @@ private static void AddActionServices(IServiceCollection services)
             services.AddTransientUserActionAuthorizerForActionInAllTasks<UniqueSignatureAuthorizer>("sign");
         }
 
-        private static void AddFileAnalyserServices(IServiceCollection services)
-        {
-            services.TryAddTransient<IFileAnalysisService, FileAnalysisService>();
-            services.TryAddTransient<IFileAnalyserFactory, FileAnalyserFactory>();
-        }
-
-        private static void AddFileValidatorServices(IServiceCollection services)
-        {
-            services.TryAddTransient<IFileValidationService, FileValidationService>();
-            services.TryAddTransient<IFileValidatorFactory, FileValidatorFactory>();
-        }
-
         private static void AddMetricsDecorators(IServiceCollection services, IConfiguration configuration)
         {
             MetricsSettings metricsSettings = configuration.GetSection("MetricsSettings")?.Get<MetricsSettings>() ?? new MetricsSettings();
diff --git a/src/Altinn.App.Core/Features/FileAnalysis/FileAnalysisResult.cs b/src/Altinn.App.Core/Features/FileAnalysis/FileAnalysisResult.cs
new file mode 100644
index 000000000..b5760b42d
--- /dev/null
+++ b/src/Altinn.App.Core/Features/FileAnalysis/FileAnalysisResult.cs
@@ -0,0 +1,41 @@
+namespace Altinn.App.Core.Features.FileAnalysis;
+
+/// <summary>
+/// Results from a file analysis done based the content of the file, ie. the binary data.
+/// </summary>
+public class FileAnalysisResult
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FileAnalysisService"/> class.
+    /// </summary>
+    public FileAnalysisResult(string analyserId)
+    {
+        AnalyserId = analyserId;
+    }
+
+    /// <summary>
+    /// The id of the analyser generating the result.
+    /// </summary>
+    public string AnalyserId { get; internal set; }
+
+    /// <summary>
+    /// The name of the analysed file.
+    /// </summary>
+    public string? Filename { get; set; }
+
+    /// <summary>
+    /// The file extension(s) without the . i.e. pdf | png | docx
+    /// Some mime types might have multiple extensions registered for ecample image/jpeg has both jpg and jpeg.
+    /// </summary>
+    public List<string> Extensions { get; set; } = new List<string>();
+
+    /// <summary>
+    /// The mime type
+    /// </summary>
+    public string? MimeType { get; set; }
+        
+    /// <summary>
+    /// Key/Value pairs containing findings from the analysis.
+    /// </summary>
+    public IDictionary<string, string> Metadata { get; private set; } = new Dictionary<string, string>();
+}
\ No newline at end of file
diff --git a/src/Altinn.App.Core/Features/FileAnalysis/IFileAnalyser.cs b/src/Altinn.App.Core/Features/FileAnalysis/IFileAnalyser.cs
new file mode 100644
index 000000000..804e98929
--- /dev/null
+++ b/src/Altinn.App.Core/Features/FileAnalysis/IFileAnalyser.cs
@@ -0,0 +1,19 @@
+namespace Altinn.App.Core.Features.FileAnalysis;
+
+/// <summary>
+/// Interface for doing extended binary file analysing.
+/// </summary>
+public interface IFileAnalyser
+{
+    /// <summary>
+    /// The id of the analyser to be used when enabling it from config.
+    /// </summary>
+    public string Id { get; }
+
+    /// <summary>
+    /// Analyses a stream with the intent to extract metadata.
+    /// </summary>
+    /// <param name="stream">The stream to analyse. One stream = one file.</param>
+    /// <param name="filename">Filename. Optional parameter if the implementation needs the name of the file, relative or absolute path.</param>
+    public Task<FileAnalysisResult> Analyse(Stream stream, string? filename = null);
+}
\ No newline at end of file
diff --git a/src/Altinn.App.Core/Features/FileAnalyzis/FileAnalyserFactory.cs b/src/Altinn.App.Core/Features/FileAnalyzis/FileAnalyserFactory.cs
deleted file mode 100644
index 6ed150674..000000000
--- a/src/Altinn.App.Core/Features/FileAnalyzis/FileAnalyserFactory.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Altinn.App.Core.Features.FileAnalysis;
-using Altinn.Platform.Storage.Interface.Models;
-
-namespace Altinn.App.Core.Features.FileAnalyzis
-{
-    /// <summary>
-    /// Factory class that resolves the correct file analysers to run on against a <see cref="DataType"/>.
-    /// </summary>
-    public class FileAnalyserFactory : IFileAnalyserFactory
-    {
-        private readonly IEnumerable<IFileAnalyser> _fileAnalysers;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileAnalyserFactory"/> class.
-        /// </summary>
-        public FileAnalyserFactory(IEnumerable<IFileAnalyser> fileAnalysers)
-        {
-            _fileAnalysers = fileAnalysers;
-        }
-
-        /// <summary>
-        /// Finds the specified file analyser implementations based on the specified analyser id's.
-        /// </summary>
-        public IEnumerable<IFileAnalyser> GetFileAnalysers(IEnumerable<string> analyserIds)
-        {
-            return _fileAnalysers.Where(x => analyserIds.Contains(x.Id)).ToList();
-        }
-    }
-}
diff --git a/src/Altinn.App.Core/Features/FileAnalyzis/FileAnalysisResult.cs b/src/Altinn.App.Core/Features/FileAnalyzis/FileAnalysisResult.cs
deleted file mode 100644
index 279cd97d3..000000000
--- a/src/Altinn.App.Core/Features/FileAnalyzis/FileAnalysisResult.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Altinn.App.Core.Features.FileAnalyzis;
-
-namespace Altinn.App.Core.Features.FileAnalysis
-{
-    /// <summary>
-    /// Results from a file analysis done based the content of the file, ie. the binary data.
-    /// </summary>
-    public class FileAnalysisResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileAnalysisService"/> class.
-        /// </summary>
-        public FileAnalysisResult(string analyserId)
-        {
-            AnalyserId = analyserId;
-        }
-
-        /// <summary>
-        /// The id of the analyser generating the result.
-        /// </summary>
-        public string AnalyserId { get; internal set; }
-
-        /// <summary>
-        /// The name of the analysed file.
-        /// </summary>
-        public string? Filename { get; set; }
-
-        /// <summary>
-        /// The file extension(s) without the . i.e. pdf | png | docx
-        /// Some mime types might have multiple extensions registered for ecample image/jpeg has both jpg and jpeg.
-        /// </summary>
-        public List<string> Extensions { get; set; } = new List<string>();
-
-        /// <summary>
-        /// The mime type
-        /// </summary>
-        public string? MimeType { get; set; }
-        
-        /// <summary>
-        /// Key/Value pairs containing findings from the analysis.
-        /// </summary>
-        public IDictionary<string, string> Metadata { get; private set; } = new Dictionary<string, string>();        
-    }
-}
diff --git a/src/Altinn.App.Core/Features/FileAnalyzis/FileAnalysisService.cs b/src/Altinn.App.Core/Features/FileAnalyzis/FileAnalysisService.cs
deleted file mode 100644
index 84c13d0d8..000000000
--- a/src/Altinn.App.Core/Features/FileAnalyzis/FileAnalysisService.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Altinn.App.Core.Features.FileAnalysis;
-using Altinn.Platform.Storage.Interface.Models;
-
-namespace Altinn.App.Core.Features.FileAnalyzis
-{
-    /// <summary>
-    /// Analyses a file using the registred analysers on the <see cref="DataType"/>
-    /// </summary>
-    public class FileAnalysisService : IFileAnalysisService
-    {
-        private readonly IFileAnalyserFactory _fileAnalyserFactory;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileAnalysisService"/> class.
-        /// </summary>
-        public FileAnalysisService(IFileAnalyserFactory fileAnalyserFactory)
-        {
-            _fileAnalyserFactory = fileAnalyserFactory;
-        }
-
-        /// <summary>
-        /// Runs the specified file analysers against the stream provided.
-        /// </summary>
-        public async Task<IEnumerable<FileAnalysisResult>> Analyse(DataType dataType, Stream fileStream, string? filename = null)
-        {
-            List<IFileAnalyser> fileAnalysers = _fileAnalyserFactory.GetFileAnalysers(dataType.EnabledFileAnalysers).ToList();
-
-            List<FileAnalysisResult> fileAnalysisResults = new();
-            foreach (var analyser in fileAnalysers)
-            {
-                if (fileStream.CanSeek)
-                {
-                    fileStream.Position = fileStream.Seek(0, SeekOrigin.Begin);
-                }
-                var result = await analyser.Analyse(fileStream, filename);
-                result.AnalyserId = analyser.Id;
-                result.Filename = filename;
-                fileAnalysisResults.Add(result);
-            }
-
-            return fileAnalysisResults;
-        }
-    }
-}
diff --git a/src/Altinn.App.Core/Features/FileAnalyzis/IFileAnalyser.cs b/src/Altinn.App.Core/Features/FileAnalyzis/IFileAnalyser.cs
deleted file mode 100644
index e430da273..000000000
--- a/src/Altinn.App.Core/Features/FileAnalyzis/IFileAnalyser.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Altinn.App.Core.Features.FileAnalysis
-{
-    /// <summary>
-    /// Interface for doing extended binary file analysing.
-    /// </summary>
-    public interface IFileAnalyser
-    {
-        /// <summary>
-        /// The id of the analyser to be used when enabling it from config.
-        /// </summary>
-        public string Id { get; }
-
-        /// <summary>
-        /// Analyses a stream with the intent to extract metadata.
-        /// </summary>
-        /// <param name="stream">The stream to analyse. One stream = one file.</param>
-        /// <param name="filename">Filename. Optional parameter if the implementation needs the name of the file, relative or absolute path.</param>
-        public Task<FileAnalysisResult> Analyse(Stream stream, string? filename = null);
-    }
-}
diff --git a/src/Altinn.App.Core/Features/FileAnalyzis/IFileAnalyserFactory.cs b/src/Altinn.App.Core/Features/FileAnalyzis/IFileAnalyserFactory.cs
deleted file mode 100644
index 31a5f37eb..000000000
--- a/src/Altinn.App.Core/Features/FileAnalyzis/IFileAnalyserFactory.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Altinn.App.Core.Features.FileAnalysis;
-using Altinn.Platform.Storage.Interface.Models;
-
-namespace Altinn.App.Core.Features.FileAnalyzis
-{
-    /// <summary>
-    /// Interface responsible for resolving the correct file analysers to run on against a <see cref="DataType"/>.
-    /// </summary>
-    public interface IFileAnalyserFactory
-    {
-        /// <summary>
-        /// Finds analyser implementations based on the specified id's provided.
-        /// </summary>
-        IEnumerable<IFileAnalyser> GetFileAnalysers(IEnumerable<string> analyserIds);
-    }
-}
\ No newline at end of file
diff --git a/src/Altinn.App.Core/Features/FileAnalyzis/IFileAnalysisService.cs b/src/Altinn.App.Core/Features/FileAnalyzis/IFileAnalysisService.cs
deleted file mode 100644
index 8ee841372..000000000
--- a/src/Altinn.App.Core/Features/FileAnalyzis/IFileAnalysisService.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Altinn.App.Core.Features.FileAnalysis;
-using Altinn.Platform.Storage.Interface.Models;
-
-namespace Altinn.App.Core.Features.FileAnalyzis
-{
-    /// <summary>
-    /// Interface for running all file analysers registered on a data type.
-    /// </summary>
-    public interface IFileAnalysisService
-    {
-        /// <summary>
-        /// Analyses the the specified file stream.
-        /// </summary>
-        /// <param name="dataType">The <see cref="DataType"/> where the anlysers are registered.</param>
-        /// <param name="fileStream">The file stream to analyse</param>
-        /// <param name="filename">The name of the file</param>
-        Task<IEnumerable<FileAnalysisResult>> Analyse(DataType dataType, Stream fileStream, string? filename = null);
-    }
-}
\ No newline at end of file
diff --git a/src/Altinn.App.Core/Features/Validation/FileValidationService.cs b/src/Altinn.App.Core/Features/Validation/FileValidationService.cs
deleted file mode 100644
index 7ee943dce..000000000
--- a/src/Altinn.App.Core/Features/Validation/FileValidationService.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Altinn.App.Core.Features.FileAnalysis;
-using Altinn.App.Core.Models.Validation;
-using Altinn.Platform.Storage.Interface.Models;
-
-namespace Altinn.App.Core.Features.Validation
-{
-    /// <summary>
-    /// Validates files according to the registered IFileValidation interfaces
-    /// </summary>
-    public class FileValidationService : IFileValidationService
-    {
-        private readonly IFileValidatorFactory _fileValidatorFactory;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileValidationService"/> class.
-        /// </summary>
-        public FileValidationService(IFileValidatorFactory fileValidatorFactory)
-        {
-            _fileValidatorFactory = fileValidatorFactory;
-        }
-
-        /// <summary>
-        /// Runs all registered validators on the specified <see cref="DataType"/>
-        /// </summary>
-        public async Task<(bool Success, List<ValidationIssue> Errors)> Validate(DataType dataType, IEnumerable<FileAnalysisResult> fileAnalysisResults)
-        {
-            List<ValidationIssue> allErrors = new();
-            bool allSuccess = true;
-            
-            List<IFileValidator> fileValidators = _fileValidatorFactory.GetFileValidators(dataType.EnabledFileValidators).ToList();
-            foreach (IFileValidator fileValidator in fileValidators)
-            {
-                (bool success, IEnumerable<ValidationIssue> errors) = await fileValidator.Validate(dataType, fileAnalysisResults);
-                if (!success)
-                {
-                    allSuccess = false;
-                    allErrors.AddRange(errors);
-                }
-            }
-
-            return (allSuccess, allErrors);
-        }
-    }
-}
diff --git a/src/Altinn.App.Core/Features/Validation/FileValidatorFactory.cs b/src/Altinn.App.Core/Features/Validation/FileValidatorFactory.cs
deleted file mode 100644
index aa607127d..000000000
--- a/src/Altinn.App.Core/Features/Validation/FileValidatorFactory.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Altinn.Platform.Storage.Interface.Models;
-
-namespace Altinn.App.Core.Features.Validation
-{
-    /// <summary>
-    /// Factory class that resolves the correct file validators to run on against a <see cref="DataType"/>.
-    /// </summary>
-    public class FileValidatorFactory : IFileValidatorFactory
-    {
-        private readonly IEnumerable<IFileValidator> _fileValidators;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileValidatorFactory"/> class.
-        /// </summary>
-        public FileValidatorFactory(IEnumerable<IFileValidator> fileValidators)
-        {
-            _fileValidators = fileValidators;
-        }
-
-        /// <summary>
-        /// Finds the specified file analyser implementations based on the specified analyser id's.
-        /// </summary>
-        public IEnumerable<IFileValidator> GetFileValidators(IEnumerable<string> validatorIds)
-        {
-            return _fileValidators.Where(x => validatorIds.Contains(x.Id)).ToList();
-        }
-    }
-}
diff --git a/src/Altinn.App.Core/Features/Validation/IFileValidationService.cs b/src/Altinn.App.Core/Features/Validation/IFileValidationService.cs
deleted file mode 100644
index c90f0ee25..000000000
--- a/src/Altinn.App.Core/Features/Validation/IFileValidationService.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Altinn.App.Core.Features.FileAnalysis;
-using Altinn.App.Core.Models.Validation;
-using Altinn.Platform.Storage.Interface.Models;
-
-namespace Altinn.App.Core.Features.Validation
-{
-    /// <summary>
-    /// Interface for running all file validators registered on a data type.
-    /// </summary>
-    public interface IFileValidationService
-    {
-        /// <summary>
-        /// Validates the file based on the file analysis results.
-        /// </summary>
-        Task<(bool Success, List<ValidationIssue> Errors)> Validate(DataType dataType, IEnumerable<FileAnalysisResult> fileAnalysisResults);
-    }
-}
\ No newline at end of file
diff --git a/src/Altinn.App.Core/Features/Validation/IFileValidatorFactory.cs b/src/Altinn.App.Core/Features/Validation/IFileValidatorFactory.cs
deleted file mode 100644
index 2c1f18c8c..000000000
--- a/src/Altinn.App.Core/Features/Validation/IFileValidatorFactory.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Altinn.Platform.Storage.Interface.Models;
-
-namespace Altinn.App.Core.Features.Validation
-{
-    /// <summary>
-    /// Interface responsible for resolving the correct file validators to run on against a <see cref="DataType"/>.
-    /// </summary>
-    public interface IFileValidatorFactory
-    {
-        /// <summary>
-        /// Finds validator implementations based on the specified id's provided.
-        /// </summary>
-        IEnumerable<IFileValidator> GetFileValidators(IEnumerable<string> validatorIds);
-    }
-}
\ No newline at end of file
diff --git a/src/Altinn.App.Core/Features/Validation/IValidationService.cs b/src/Altinn.App.Core/Features/Validation/IValidationService.cs
index 1f9ac0739..da4db7ae3 100644
--- a/src/Altinn.App.Core/Features/Validation/IValidationService.cs
+++ b/src/Altinn.App.Core/Features/Validation/IValidationService.cs
@@ -50,4 +50,14 @@ public interface IValidationService
     /// <param name="data">The data deserialized to the strongly typed object that represents the form data</param>
     /// <param name="changedFields">List of json paths for the fields that have changed (used for incremental validation)</param>
     Task<Dictionary<string, List<ValidationIssue>>> ValidateFormData(Instance instance, DataElement dataElement, DataType dataType, object data, List<string>? changedFields = null);
+
+    /// <summary>
+    /// Validate file uploads. This method executes validations for <see cref="IFileAnalyzer"/> and <see cref="IFileValidator"/>
+    /// </summary>
+    /// <param name="instance">The instance the file will be uploaded to</param>
+    /// <param name="dataType">The data type of the file to be uploaded</param>
+    /// <param name="fileContent">The actual bytes of the file</param>
+    /// <param name="fileName">The file name sent with the file</param>
+    /// <returns></returns>
+    Task<List<ValidationIssue>> ValidateFileUpload(Instance instance, DataType dataType, byte[] fileContent, string? fileName = null);
 }
\ No newline at end of file
diff --git a/src/Altinn.App.Core/Features/Validation/ValidationService.cs b/src/Altinn.App.Core/Features/Validation/ValidationService.cs
index 4280cd386..9780bc66f 100644
--- a/src/Altinn.App.Core/Features/Validation/ValidationService.cs
+++ b/src/Altinn.App.Core/Features/Validation/ValidationService.cs
@@ -1,7 +1,7 @@
+using Altinn.App.Core.Features.FileAnalysis;
 using Altinn.App.Core.Internal.App;
 using Altinn.App.Core.Internal.AppModel;
 using Altinn.App.Core.Internal.Data;
-using Altinn.App.Core.Internal.Process.Elements;
 using Altinn.App.Core.Models.Validation;
 using Altinn.Platform.Storage.Interface.Models;
 using Microsoft.Extensions.DependencyInjection;
@@ -158,4 +158,83 @@ public async Task<Dictionary<string, List<ValidationIssue>>> ValidateFormData(In
         return dataValidators.Zip(issuesLists).ToDictionary(kv => kv.First.Code ?? string.Empty, kv => kv.Second);
     }
 
-}
\ No newline at end of file
+
+    /// <inheritdoc/>
+    public async Task<List<ValidationIssue>> ValidateFileUpload(Instance instance, DataType dataType, byte[] fileBytes, string? fileName = null)
+    {
+        var fileAnalysisResults = new List<FileAnalysisResult>();
+        if (FileAnalysisEnabledForDataType(dataType))
+        {
+            using var fileStream = new MemoryStream(fileBytes);
+            fileAnalysisResults = await Analyse(dataType, fileStream, fileName);
+        }
+
+        bool fileValidationSuccess = true;
+        List<ValidationIssue> validationIssues = new();
+        if (FileValidationEnabledForDataType(dataType))
+        {
+            (fileValidationSuccess, validationIssues) = await Validate(dataType, fileAnalysisResults);
+        }
+
+        return validationIssues;
+    }
+
+    private static bool FileAnalysisEnabledForDataType(DataType dataTypeFromMetadata)
+    {
+        return dataTypeFromMetadata.EnabledFileAnalysers != null && dataTypeFromMetadata.EnabledFileAnalysers.Count > 0;
+    }
+
+    private static bool FileValidationEnabledForDataType(DataType dataTypeFromMetadata)
+    {
+        return dataTypeFromMetadata.EnabledFileValidators != null && dataTypeFromMetadata.EnabledFileValidators.Count > 0;
+    }
+
+    private async Task<(bool Success, List<ValidationIssue> Errors)> Validate(DataType dataType, List<FileAnalysisResult> fileAnalysisResults)
+    {
+        List<ValidationIssue> allErrors = new();
+        bool allSuccess = true;
+
+        var fileValidators = _serviceProvider.GetServices<IFileValidator>()
+            .Where(fv => dataType.EnabledFileValidators.Contains(fv.Id))
+            .Concat(_serviceProvider.GetKeyedServices<IFileValidator>(dataType.Id))
+            .ToList();
+
+        foreach (IFileValidator fileValidator in fileValidators)
+        {
+            (bool success, IEnumerable<ValidationIssue> errors) = await fileValidator.Validate(dataType, fileAnalysisResults);
+            if (!success)
+            {
+                allSuccess = false;
+                allErrors.AddRange(errors);
+            }
+        }
+
+        return (allSuccess, allErrors);
+    }
+
+    /// <summary>
+    /// Runs the specified file analysers against the stream provided.
+    /// </summary>
+    private async Task<List<FileAnalysisResult>> Analyse(DataType dataType, Stream fileStream, string? filename = null)
+    {
+        var fileAnalysers = _serviceProvider.GetServices<IFileAnalyser>()
+            .Where(fa => dataType.EnabledFileAnalysers.Contains(fa.Id))
+            .Concat(_serviceProvider.GetKeyedServices<IFileAnalyser>(dataType.Id));
+
+        List<FileAnalysisResult> fileAnalysisResults = new();
+        foreach (var analyser in fileAnalysers)
+        {
+            if (fileStream.CanSeek)
+            {
+                fileStream.Position = fileStream.Seek(0, SeekOrigin.Begin);
+            }
+            var result = await analyser.Analyse(fileStream, filename);
+            result.AnalyserId = analyser.Id;
+            result.Filename = filename;
+            fileAnalysisResults.Add(result);
+        }
+
+        return fileAnalysisResults;
+    }
+
+}