diff --git a/web/backend/API/API.Core/Dockerfile b/web/backend/API/API.Core/Dockerfile
index 098b0972..867f0a9f 100644
--- a/web/backend/API/API.Core/Dockerfile
+++ b/web/backend/API/API.Core/Dockerfile
@@ -37,7 +37,6 @@ COPY ["Infrastructure/Infrastructure.Configuration/Infrastructure.Configuration.
 COPY ["Infrastructure/Infrastructure.Email/Infrastructure.Email.csproj", "Infrastructure/Infrastructure.Email/"]
 COPY ["Infrastructure/Infrastructure.FileUpload/Infrastructure.FileUpload.csproj", "Infrastructure/Infrastructure.FileUpload/"]
 COPY ["Infrastructure/Infrastructure.Jwt/Infrastructure.Jwt.csproj", "Infrastructure/Infrastructure.Jwt/"]
-COPY ["Infrastructure/Infrastructure.PasswordHashing/Infrastructure.PasswordHashing.csproj", "Infrastructure/Infrastructure.PasswordHashing/"]
 COPY ["Shared/Shared.Application/Shared.Application.csproj", "Shared/Shared.Application/"]
 COPY ["Shared/Shared.Contracts/Shared.Contracts.csproj", "Shared/Shared.Contracts/"]
 RUN dotnet restore "Biergarten.API.slnx"
diff --git a/web/backend/API/API.Specs/Dockerfile b/web/backend/API/API.Specs/Dockerfile
index 32fcf15f..008695b6 100644
--- a/web/backend/API/API.Specs/Dockerfile
+++ b/web/backend/API/API.Specs/Dockerfile
@@ -27,7 +27,6 @@ COPY ["Infrastructure/Infrastructure.Configuration/Infrastructure.Configuration.
 COPY ["Infrastructure/Infrastructure.Email/Infrastructure.Email.csproj", "Infrastructure/Infrastructure.Email/"]
 COPY ["Infrastructure/Infrastructure.FileUpload/Infrastructure.FileUpload.csproj", "Infrastructure/Infrastructure.FileUpload/"]
 COPY ["Infrastructure/Infrastructure.Jwt/Infrastructure.Jwt.csproj", "Infrastructure/Infrastructure.Jwt/"]
-COPY ["Infrastructure/Infrastructure.PasswordHashing/Infrastructure.PasswordHashing.csproj", "Infrastructure/Infrastructure.PasswordHashing/"]
 COPY ["Shared/Shared.Application/Shared.Application.csproj", "Shared/Shared.Application/"]
 COPY ["Shared/Shared.Contracts/Shared.Contracts.csproj", "Shared/Shared.Contracts/"]
 RUN dotnet restore "Biergarten.API.slnx"
diff --git a/web/backend/Biergarten.API.slnx b/web/backend/Biergarten.API.slnx
index 09ddefdd..d24083dd 100644
--- a/web/backend/Biergarten.API.slnx
+++ b/web/backend/Biergarten.API.slnx
@@ -24,7 +24,6 @@
         <Project Path="Infrastructure/Infrastructure.Email/Infrastructure.Email.csproj" />
         <Project Path="Infrastructure/Infrastructure.FileUpload/Infrastructure.FileUpload.csproj" />
         <Project Path="Infrastructure/Infrastructure.Jwt/Infrastructure.Jwt.csproj" />
-        <Project Path="Infrastructure/Infrastructure.PasswordHashing/Infrastructure.PasswordHashing.csproj" />
     </Folder>
     <Folder Name="/Features/" />
     <Folder Name="/Features/Users/">
diff --git a/web/backend/Features/Features.Users/DependencyInjection/FeaturesUsersServiceCollectionExtensions.cs b/web/backend/Features/Features.Users/DependencyInjection/FeaturesUsersServiceCollectionExtensions.cs
index 7c23bf65..bd334afb 100644
--- a/web/backend/Features/Features.Users/DependencyInjection/FeaturesUsersServiceCollectionExtensions.cs
+++ b/web/backend/Features/Features.Users/DependencyInjection/FeaturesUsersServiceCollectionExtensions.cs
@@ -1,7 +1,6 @@
 using Features.Users.Identity;
 using Features.Users.Repository;
 using Features.Users.Services;
-using Infrastructure.PasswordHashing;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/web/backend/Features/Features.Users/Features.Users.csproj b/web/backend/Features/Features.Users/Features.Users.csproj
index 7cd6297a..692af470 100644
--- a/web/backend/Features/Features.Users/Features.Users.csproj
+++ b/web/backend/Features/Features.Users/Features.Users.csproj
@@ -16,10 +16,13 @@
         <ProjectReference Include="..\..\Domain\Domain.Exceptions\Domain.Exceptions.csproj" />
         <ProjectReference Include="..\..\Infrastructure\Infrastructure.Configuration\Infrastructure.Configuration.csproj" />
         <ProjectReference Include="..\..\Infrastructure\Infrastructure.Jwt\Infrastructure.Jwt.csproj" />
-        <ProjectReference Include="..\..\Infrastructure\Infrastructure.PasswordHashing\Infrastructure.PasswordHashing.csproj" />
         <ProjectReference Include="..\..\Database\Database.Connection\Database.Connection.csproj" />
         <ProjectReference Include="..\Features.PhotoUpload\Features.PhotoUpload.csproj" />
         <ProjectReference Include="..\..\Shared\Shared.Contracts\Shared.Contracts.csproj" />
         <ProjectReference Include="..\..\Shared\Shared.Application\Shared.Application.csproj" />
     </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.1" />
+    </ItemGroup>
 </Project>
diff --git a/web/backend/Infrastructure/Infrastructure.PasswordHashing/Argon2Infrastructure.cs b/web/backend/Features/Features.Users/Identity/Argon2Infrastructure.cs
similarity index 98%
rename from web/backend/Infrastructure/Infrastructure.PasswordHashing/Argon2Infrastructure.cs
rename to web/backend/Features/Features.Users/Identity/Argon2Infrastructure.cs
index b938365e..9443f272 100644
--- a/web/backend/Infrastructure/Infrastructure.PasswordHashing/Argon2Infrastructure.cs
+++ b/web/backend/Features/Features.Users/Identity/Argon2Infrastructure.cs
@@ -3,7 +3,7 @@ using System.Security.Cryptography;
 using System.Text;
 using Konscious.Security.Cryptography;
 
-namespace Infrastructure.PasswordHashing;
+namespace Features.Users.Identity;
 
 /// <summary>
 ///     Hashes and verifies passwords using the Argon2id algorithm via Konscious.Security.Cryptography.
diff --git a/web/backend/Features/Features.Users/Identity/Argon2PasswordHasher.cs b/web/backend/Features/Features.Users/Identity/Argon2PasswordHasher.cs
index 824b4afd..852aa845 100644
--- a/web/backend/Features/Features.Users/Identity/Argon2PasswordHasher.cs
+++ b/web/backend/Features/Features.Users/Identity/Argon2PasswordHasher.cs
@@ -1,4 +1,3 @@
-using Infrastructure.PasswordHashing;
 using Microsoft.AspNetCore.Identity;
 
 namespace Features.Users.Identity;
diff --git a/web/backend/Infrastructure/Infrastructure.PasswordHashing/IPasswordInfrastructure.cs b/web/backend/Features/Features.Users/Identity/IPasswordInfrastructure.cs
similarity index 92%
rename from web/backend/Infrastructure/Infrastructure.PasswordHashing/IPasswordInfrastructure.cs
rename to web/backend/Features/Features.Users/Identity/IPasswordInfrastructure.cs
index 50e13b6a..9524f033 100644
--- a/web/backend/Infrastructure/Infrastructure.PasswordHashing/IPasswordInfrastructure.cs
+++ b/web/backend/Features/Features.Users/Identity/IPasswordInfrastructure.cs
@@ -1,4 +1,4 @@
-namespace Infrastructure.PasswordHashing;
+namespace Features.Users.Identity;
 
 /// <summary>
 ///     Service for hashing and verifying user passwords.
diff --git a/web/backend/Infrastructure/Infrastructure.PasswordHashing/Infrastructure.PasswordHashing.csproj b/web/backend/Infrastructure/Infrastructure.PasswordHashing/Infrastructure.PasswordHashing.csproj
deleted file mode 100644
index 614d5e40..00000000
--- a/web/backend/Infrastructure/Infrastructure.PasswordHashing/Infrastructure.PasswordHashing.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net10.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <RootNamespace>Infrastructure.PasswordHashing</RootNamespace>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.1" />
-    </ItemGroup>
-</Project>