diff --git a/Lombiq.Hosting.Tenants.sln b/Lombiq.Hosting.Tenants.sln
index e7fcaca9..8948676e 100644
--- a/Lombiq.Hosting.Tenants.sln
+++ b/Lombiq.Hosting.Tenants.sln
@@ -15,13 +15,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Hosting.Tenants.Idle
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI", "Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI\Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI.csproj", "{BC3DE841-E400-40C5-99C1-96B9299C9B04}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lombiq.Hosting.Tenants.MediaStorageManagement", "Lombiq.Hosting.Tenants.MediaStorageManagement\Lombiq.Hosting.Tenants.MediaStorageManagement.csproj", "{EFF031F1-7464-428E-9343-B1173529AC54}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Hosting.Tenants.MediaStorageManagement", "Lombiq.Hosting.Tenants.MediaStorageManagement\Lombiq.Hosting.Tenants.MediaStorageManagement.csproj", "{EFF031F1-7464-428E-9343-B1173529AC54}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI", "Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI\Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI.csproj", "{4BE4E5C8-7DB6-49D2-855E-7220B039DDF4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI", "Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI\Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI.csproj", "{4BE4E5C8-7DB6-49D2-855E-7220B039DDF4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lombiq.Hosting.Tenants.Maintenance", "Lombiq.Hosting.Tenants.Maintenance\Lombiq.Hosting.Tenants.Maintenance.csproj", "{6D3217B9-EA0F-4608-BA9B-B9B935AEDF3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Hosting.Tenants.Maintenance", "Lombiq.Hosting.Tenants.Maintenance\Lombiq.Hosting.Tenants.Maintenance.csproj", "{6D3217B9-EA0F-4608-BA9B-B9B935AEDF3A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lombiq.Hosting.Tenants.Maintenance.Tests.UI", "Lombiq.Hosting.Tenants.Maintenance.Tests.UI\Lombiq.Hosting.Tenants.Maintenance.Tests.UI.csproj", "{5E1E19E5-18EB-49A1-B392-3BD74418D9FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Hosting.Tenants.Maintenance.Tests.UI", "Lombiq.Hosting.Tenants.Maintenance.Tests.UI\Lombiq.Hosting.Tenants.Maintenance.Tests.UI.csproj", "{5E1E19E5-18EB-49A1-B392-3BD74418D9FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Hosting.Tenants.EnvironmentRobots", "Lombiq.Hosting.Tenants.EnvironmentRobots\Lombiq.Hosting.Tenants.EnvironmentRobots.csproj", "{DDFE8464-C855-4292-B3B9-F36A7989882B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI", "Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI\Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI.csproj", "{158D7234-FA0B-413A-BE30-1CA6D8DB11F6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -69,6 +73,14 @@ Global
 		{5E1E19E5-18EB-49A1-B392-3BD74418D9FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E1E19E5-18EB-49A1-B392-3BD74418D9FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E1E19E5-18EB-49A1-B392-3BD74418D9FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDFE8464-C855-4292-B3B9-F36A7989882B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDFE8464-C855-4292-B3B9-F36A7989882B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDFE8464-C855-4292-B3B9-F36A7989882B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDFE8464-C855-4292-B3B9-F36A7989882B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{158D7234-FA0B-413A-BE30-1CA6D8DB11F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{158D7234-FA0B-413A-BE30-1CA6D8DB11F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{158D7234-FA0B-413A-BE30-1CA6D8DB11F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{158D7234-FA0B-413A-BE30-1CA6D8DB11F6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Readme.md b/Readme.md
index 6d3b5c4d..1ace4dee 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,6 +1,6 @@
 # Lombiq Hosting - Tenants for Orchard Core
 
-[![Lombiq.Hosting.Tenants.Admin.Login NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.Admin.Login?label=Lombiq.Hosting.Tenants.Admin.Login)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.Admin.Login/) [![Lombiq.Hosting.Tenants.FeaturesGuard NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.FeaturesGuard?label=Lombiq.Hosting.Tenants.FeaturesGuard)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.FeaturesGuard/) [![Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI?label=Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI/) [![Lombiq.Hosting.Tenants.IdleTenantManagement NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.IdleTenantManagement?label=Lombiq.Hosting.Tenants.IdleTenantManagement)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.IdleTenantManagement/) [![Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI?label=Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI/) [![Lombiq.Hosting.Tenants.Management NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.Management?label=Lombiq.Hosting.Tenants.Management)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.Management/) [![Lombiq.Hosting.Tenants.Maintenance NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.Maintenance?label=Lombiq.Hosting.Tenants.Maintenance)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.Maintenance/) [![Lombiq.Hosting.Tenants.Maintenance.Tests.UI NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.Maintenance.Tests.UI?label=Lombiq.Hosting.Tenants.Maintenance.Tests.UI)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.Maintenance.Tests.UI/) [![Lombiq.Hosting.Tenants.MediaStorageManagement NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.MediaStorageManagement?label=Lombiq.Hosting.Tenants.MediaStorageManagement)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.MediaStorageManagement/) [![Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI?label=Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI/)
+[![Lombiq.Hosting.Tenants.Admin.Login NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.Admin.Login?label=Lombiq.Hosting.Tenants.Admin.Login)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.Admin.Login/) [![Lombiq.Hosting.Tenants.FeaturesGuard NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.FeaturesGuard?label=Lombiq.Hosting.Tenants.FeaturesGuard)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.FeaturesGuard/) [![Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI?label=Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI/) [![Lombiq.Hosting.Tenants.IdleTenantManagement NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.IdleTenantManagement?label=Lombiq.Hosting.Tenants.IdleTenantManagement)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.IdleTenantManagement/) [![Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI?label=Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI/) [![Lombiq.Hosting.Tenants.Management NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.Management?label=Lombiq.Hosting.Tenants.Management)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.Management/) [![Lombiq.Hosting.Tenants.Maintenance NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.Maintenance?label=Lombiq.Hosting.Tenants.Maintenance)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.Maintenance/) [![Lombiq.Hosting.Tenants.Maintenance.Tests.UI NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.Maintenance.Tests.UI?label=Lombiq.Hosting.Tenants.Maintenance.Tests.UI)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.Maintenance.Tests.UI/) [![Lombiq.Hosting.Tenants.MediaStorageManagement NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.MediaStorageManagement?label=Lombiq.Hosting.Tenants.MediaStorageManagement)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.MediaStorageManagement/) [![Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI?label=Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI/) [![Lombiq.Hosting.Tenants.EnvironmentRobots NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.EnvironmentRobots?label=Lombiq.Hosting.Tenants.EnvironmentRobots)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.EnvironmentRobots/) [![Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI NuGet](https://img.shields.io/nuget/v/Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI?label=Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI)](https://www.nuget.org/packages/Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI/)
 
 ## About
 
@@ -20,6 +20,7 @@ The project consists of the following independent modules:
 - [Lombiq Hosting - Tenants Maintenance](Lombiq.Hosting.Tenants.Maintenance/Readme.md)
 - [Lombiq Hosting - Tenants Idle Tenant Management](Lombiq.Hosting.Tenants.IdleTenantManagement/Readme.md)
 - [Lombiq Hosting - Tenants Media Storage Management](Lombiq.Hosting.Tenants.MediaStorageManagement/Readme.md)
+- [Lombiq Hosting - Tenants Environment Robots](Lombiq.Hosting.Tenants.EnvironmentRobots/Readme.md)
 
 ## Contributing and support