diff --git a/ConsumerApi/TokensDbContextSeeder.cs b/ConsumerApi/TokensDbContextSeeder.cs
index 7e0b3ee310..b5965f391a 100644
--- a/ConsumerApi/TokensDbContextSeeder.cs
+++ b/ConsumerApi/TokensDbContextSeeder.cs
@@ -17,7 +17,7 @@ public class TokensDbContextSeeder : IDbSeeder<TokensDbContext>
     public TokensDbContextSeeder(IServiceProvider serviceProvider)
     {
         _blobStorage = serviceProvider.GetService<IBlobStorage>();
-        _blobRootFolder = serviceProvider.GetService<IOptions<BlobOptions>>()!.Value.RootFolder;
+        _blobRootFolder = serviceProvider.GetService<IOptions<BlobOptions>>()?.Value.RootFolder;
     }
 
     public async Task SeedAsync(TokensDbContext context)
diff --git a/Modules/Tokens/src/Tokens.Application/Infrastructure/Persistence/BlobOptions.cs b/Modules/Tokens/src/Tokens.Application/Infrastructure/Persistence/BlobOptions.cs
index 5fd65a294d..853b731b8c 100644
--- a/Modules/Tokens/src/Tokens.Application/Infrastructure/Persistence/BlobOptions.cs
+++ b/Modules/Tokens/src/Tokens.Application/Infrastructure/Persistence/BlobOptions.cs
@@ -2,5 +2,5 @@
 
 public class BlobOptions
 {
-    public string RootFolder { get; set; }
+    public string? RootFolder { get; set; }
 }
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens.Application.csproj b/Modules/Tokens/src/Tokens.Application/Tokens.Application.csproj
index 7872142cd5..241aaab1e0 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens.Application.csproj
+++ b/Modules/Tokens/src/Tokens.Application/Tokens.Application.csproj
@@ -1,6 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<ItemGroup>
+    <PropertyGroup>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
 		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.8.1" />
 	</ItemGroup>
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommand.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommand.cs
index 7351f766a5..addf76f9c5 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommand.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommand.cs
@@ -8,6 +8,6 @@ namespace Backbone.Modules.Tokens.Application.Tokens.Commands.CreateToken;
 [ApplyQuotasForMetrics("NumberOfTokens")]
 public class CreateTokenCommand : IRequest<CreateTokenResponse>, IMapTo<Token>
 {
-    public byte[] Content { get; set; }
-    public DateTime ExpiresAt { get; set; }
+    public required byte[] Content { get; set; }
+    public required DateTime ExpiresAt { get; set; }
 }
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenResponse.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenResponse.cs
index b1dd011b47..2c9bb87724 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenResponse.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenResponse.cs
@@ -5,6 +5,6 @@ namespace Backbone.Modules.Tokens.Application.Tokens.Commands.CreateToken;
 
 public class CreateTokenResponse : IMapTo<Token>
 {
-    public TokenId Id { get; set; }
-    public DateTime CreatedAt { get; set; }
+    public required TokenId Id { get; set; }
+    public required DateTime CreatedAt { get; set; }
 }
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/DTOs/TokenDTO.cs b/Modules/Tokens/src/Tokens.Application/Tokens/DTOs/TokenDTO.cs
index 71fad7976e..11b4debedc 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/DTOs/TokenDTO.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/DTOs/TokenDTO.cs
@@ -6,13 +6,13 @@ namespace Backbone.Modules.Tokens.Application.Tokens.DTOs;
 
 public class TokenDTO : IMapTo<Token>
 {
-    public TokenId Id { get; set; }
+    public required TokenId Id { get; set; }
 
-    public IdentityAddress CreatedBy { get; set; }
-    public DeviceId CreatedByDevice { get; set; }
+    public required IdentityAddress CreatedBy { get; set; }
+    public required DeviceId CreatedByDevice { get; set; }
 
-    public DateTime CreatedAt { get; set; }
-    public DateTime ExpiresAt { get; set; }
+    public required DateTime CreatedAt { get; set; }
+    public required DateTime ExpiresAt { get; set; }
 
-    public byte[] Content { get; set; }
+    public required byte[] Content { get; set; }
 }
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Queries/GetToken/GetTokenQuery.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Queries/GetToken/GetTokenQuery.cs
index 4d6bdf50e8..1d8f60fae1 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Queries/GetToken/GetTokenQuery.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Queries/GetToken/GetTokenQuery.cs
@@ -6,5 +6,5 @@ namespace Backbone.Modules.Tokens.Application.Tokens.Queries.GetToken;
 
 public class GetTokenQuery : IRequest<TokenDTO>
 {
-    public TokenId Id { get; set; }
+    public required TokenId Id { get; set; }
 }
diff --git a/Modules/Tokens/src/Tokens.Domain/Tokens.Domain.csproj b/Modules/Tokens/src/Tokens.Domain/Tokens.Domain.csproj
index 206199716d..757c63fd6c 100644
--- a/Modules/Tokens/src/Tokens.Domain/Tokens.Domain.csproj
+++ b/Modules/Tokens/src/Tokens.Domain/Tokens.Domain.csproj
@@ -4,9 +4,6 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
-	<ItemGroup>
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\..\BuildingBlocks\src\DevelopmentKit.Identity\DevelopmentKit.Identity.csproj" />
 		<ProjectReference Include="..\..\..\..\BuildingBlocks\src\Tooling\Tooling.csproj" />
diff --git a/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/Tokens.Infrastructure.Database.Postgres.csproj b/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/Tokens.Infrastructure.Database.Postgres.csproj
index d9209881a2..00e9001654 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/Tokens.Infrastructure.Database.Postgres.csproj
+++ b/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/Tokens.Infrastructure.Database.Postgres.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Tokens.Infrastructure\Tokens.Infrastructure.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Tokens.Infrastructure\Tokens.Infrastructure.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/Tokens.Infrastructure.Database.SqlServer.csproj b/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/Tokens.Infrastructure.Database.SqlServer.csproj
index d9209881a2..00e9001654 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/Tokens.Infrastructure.Database.SqlServer.csproj
+++ b/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/Tokens.Infrastructure.Database.SqlServer.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Tokens.Infrastructure\Tokens.Infrastructure.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Tokens.Infrastructure\Tokens.Infrastructure.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs
index d2c50059d3..8777f8be7d 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs
+++ b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs
@@ -14,7 +14,7 @@ public static class IServiceCollectionExtensions
     public static void AddDatabase(this IServiceCollection services, Action<DbOptions> setupOptions)
     {
         var options = new DbOptions();
-        setupOptions?.Invoke(options);
+        setupOptions.Invoke(options);
 
         services.AddDatabase(options);
     }
@@ -53,8 +53,8 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
 
 public class DbOptions
 {
-    public string Provider { get; set; }
-    public string DbConnectionString { get; set; }
+    public string Provider { get; set; } = null!;
+    public string DbConnectionString { get; set; } = null!;
     public RetryOptions RetryOptions { get; set; } = new();
 }
 
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/TokensDbContext.cs b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/TokensDbContext.cs
index 1a536236ba..00a8c7c65c 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/TokensDbContext.cs
+++ b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/TokensDbContext.cs
@@ -7,13 +7,19 @@ namespace Backbone.Modules.Tokens.Infrastructure.Persistence.Database;
 
 public class TokensDbContext : AbstractDbContextBase
 {
-    public TokensDbContext() { }
+    public TokensDbContext()
+    {
+    }
 
-    public TokensDbContext(DbContextOptions<TokensDbContext> options) : base(options) { }
+    public TokensDbContext(DbContextOptions<TokensDbContext> options) : base(options)
+    {
+    }
 
-    public TokensDbContext(DbContextOptions<TokensDbContext> options, IServiceProvider serviceProvider) : base(options, serviceProvider) { }
+    public TokensDbContext(DbContextOptions<TokensDbContext> options, IServiceProvider serviceProvider) : base(options, serviceProvider)
+    {
+    }
 
-    public virtual DbSet<Token> Tokens { get; set; }
+    public virtual DbSet<Token> Tokens { get; set; } = null!;
 
     //protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     //{
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/ValueConverters/TokenIdEntityFrameworkValueConverter.cs b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/ValueConverters/TokenIdEntityFrameworkValueConverter.cs
index 715e547426..b7c5feacd3 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/ValueConverters/TokenIdEntityFrameworkValueConverter.cs
+++ b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/ValueConverters/TokenIdEntityFrameworkValueConverter.cs
@@ -7,9 +7,9 @@ public class TokenIdEntityFrameworkValueConverter : ValueConverter<TokenId, stri
 {
     public TokenIdEntityFrameworkValueConverter() : this(null) { }
 
-    public TokenIdEntityFrameworkValueConverter(ConverterMappingHints mappingHints)
+    public TokenIdEntityFrameworkValueConverter(ConverterMappingHints? mappingHints)
         : base(
-            id => id == null ? null : id.StringValue,
+            id => id.StringValue,
             value => TokenId.Parse(value),
             mappingHints
         )
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/IServiceCollectionExtensions.cs b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/IServiceCollectionExtensions.cs
index fbe383f00b..57cd83fd6d 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/IServiceCollectionExtensions.cs
+++ b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/IServiceCollectionExtensions.cs
@@ -11,7 +11,7 @@ public static class IServiceCollectionExtensions
     public static void AddPersistence(this IServiceCollection services, Action<PersistenceOptions> setupOptions)
     {
         var options = new PersistenceOptions();
-        setupOptions?.Invoke(options);
+        setupOptions.Invoke(options);
 
         services.AddPersistence(options);
     }
@@ -26,7 +26,6 @@ public static void AddPersistence(this IServiceCollection services, PersistenceO
             services.Configure<BlobOptions>(blobOptions => blobOptions.RootFolder = options.BlobStorageOptions.Container);
         }
 
-
         services.AddRepositories();
     }
 }
@@ -34,5 +33,5 @@ public static void AddPersistence(this IServiceCollection services, PersistenceO
 public class PersistenceOptions
 {
     public DbOptions DbOptions { get; set; } = new();
-    public BlobStorageOptions BlobStorageOptions { get; set; }
+    public BlobStorageOptions? BlobStorageOptions { get; set; }
 }
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/TokensRepository.cs b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/TokensRepository.cs
index 549a912783..63d6d7a10c 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/TokensRepository.cs
+++ b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/TokensRepository.cs
@@ -44,7 +44,7 @@ public async Task<DbPaginationResult<Token>> FindAllOfOwner(IdentityAddress owne
         return await Find(owner, Array.Empty<TokenId>(), paginationFilter, cancellationToken);
     }
 
-    private async Task<DbPaginationResult<Token>> Find(IdentityAddress owner, IEnumerable<TokenId> ids, PaginationFilter paginationFilter, CancellationToken cancellationToken)
+    private async Task<DbPaginationResult<Token>> Find(IdentityAddress? owner, IEnumerable<TokenId> ids, PaginationFilter paginationFilter, CancellationToken cancellationToken)
     {
         if (paginationFilter == null)
             throw new Exception("A pagination filter has to be provided.");
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj b/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj
index de1307d41b..e4b46c2b35 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj
+++ b/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj
@@ -1,6 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<ItemGroup>
+    <PropertyGroup>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
diff --git a/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj b/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj
index 8bf0201b61..0897db549c 100644
--- a/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj
+++ b/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj
@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <IsPackable>false</IsPackable>
+        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>