diff --git a/Shared.IntegrationTesting/DockerHelper.cs b/Shared.IntegrationTesting/DockerHelper.cs
index bf9b5acb..b952ea27 100644
--- a/Shared.IntegrationTesting/DockerHelper.cs
+++ b/Shared.IntegrationTesting/DockerHelper.cs
@@ -21,7 +21,7 @@ public abstract class DockerHelper
         #region Methods
 
         /// <summary>
-        /// Setups the voucher management acl container.
+        /// Setups the estate management container.
         /// </summary>
         /// <param name="containerName">Name of the container.</param>
         /// <param name="logger">The logger.</param>
@@ -30,59 +30,234 @@ public abstract class DockerHelper
         /// <param name="hostFolder">The host folder.</param>
         /// <param name="dockerCredentials">The docker credentials.</param>
         /// <param name="securityServiceContainerName">Name of the security service container.</param>
-        /// <param name="voucherManagementContainerName">Name of the voucher management container.</param>
+        /// <param name="eventStoreConnectionString">The event store connection string.</param>
+        /// <param name="sqlServerDetails">The SQL server details.</param>
         /// <param name="clientDetails">The client details.</param>
         /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
         /// <param name="securityServicePort">The security service port.</param>
         /// <param name="additionalEnvironmentVariables">The additional environment variables.</param>
         /// <returns></returns>
-        public static IContainerService SetupVoucherManagementACLContainer(String containerName, ILogger logger, String imageName,
-                                                               List<INetworkService> networkServices,
-                                                               String hostFolder,
-                                                               (String URL, String UserName, String Password)? dockerCredentials,
-                                                               String securityServiceContainerName,
-                                                               String voucherManagementContainerName,
-                                                               (string clientId, string clientSecret) clientDetails,
-                                                               Boolean forceLatestImage = false,
-                                                               Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort,
-                                                               List<String> additionalEnvironmentVariables = null)
+        public static IContainerService SetupEstateManagementContainer(String containerName,
+                                                                       ILogger logger,
+                                                                       String imageName,
+                                                                       List<INetworkService> networkServices,
+                                                                       String hostFolder,
+                                                                       (String URL, String UserName, String Password)? dockerCredentials,
+                                                                       String securityServiceContainerName,
+                                                                       String eventStoreConnectionString,
+                                                                       (String sqlServerContainerName, String sqlServerUserName, String sqlServerPassword)
+                                                                           sqlServerDetails,
+                                                                       (String clientId, String clientSecret) clientDetails,
+                                                                       Boolean forceLatestImage = false,
+                                                                       Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort,
+                                                                       List<String> additionalEnvironmentVariables = null)
         {
-            logger.LogInformation("About to Start Voucher Management ACL Container");
+            logger.LogInformation("About to Start Estate Management Container");
 
             List<String> environmentVariables = new List<String>();
+            environmentVariables.Add($"EventStoreSettings:ConnectionString={eventStoreConnectionString}");
             environmentVariables.Add($"AppSettings:SecurityService=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"AppSettings:VoucherManagementApi=http://{voucherManagementContainerName}:{DockerHelper.VoucherManagementDockerPort}");
             environmentVariables.Add($"SecurityConfiguration:Authority=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"urls=http://*:{DockerHelper.VoucherManagementACLDockerPort}");
-            environmentVariables.Add($"AppSettings:ClientId={clientDetails.clientId}");
-            environmentVariables.Add($"AppSettings:ClientSecret={clientDetails.clientSecret}");
+            environmentVariables.Add($"urls=http://*:{DockerHelper.EstateManagementDockerPort}");
+            environmentVariables
+                .Add($"ConnectionStrings:EstateReportingReadModel=\"server={sqlServerDetails.sqlServerContainerName};user id={sqlServerDetails.sqlServerUserName};password={sqlServerDetails.sqlServerPassword};database=EstateReportingReadModel\"");
 
             if (additionalEnvironmentVariables != null)
             {
                 environmentVariables.AddRange(additionalEnvironmentVariables);
             }
 
-            ContainerBuilder voucherManagementAclContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
-                                                                          .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.VoucherManagementACLDockerPort)
-                                                                          .UseNetwork(networkServices.ToArray());
-            if (String.IsNullOrEmpty(hostFolder) == false)
+            ContainerBuilder estateManagementContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
+                                                                      .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.EstateManagementDockerPort)
+                                                                      .UseNetwork(networkServices.ToArray());
+            if (string.IsNullOrEmpty(hostFolder) == false)
             {
-                voucherManagementAclContainer = voucherManagementAclContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
+                estateManagementContainer = estateManagementContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
             }
 
             if (dockerCredentials.HasValue)
             {
-                voucherManagementAclContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
+                estateManagementContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
             }
 
             // Now build and return the container                
-            IContainerService builtContainer = voucherManagementAclContainer.Build().Start().WaitForPort($"{DockerHelper.VoucherManagementACLDockerPort}/tcp", 30000);
+            IContainerService builtContainer = estateManagementContainer.Build().Start().WaitForPort($"{DockerHelper.EstateManagementDockerPort}/tcp", 30000);
 
-            logger.LogInformation("Voucher Management ACL Container Started");
+            logger.LogInformation("Estate Management Container Started");
+
+            return builtContainer;
+        }
+
+        /// <summary>
+        /// Setups the estate reporting container.
+        /// </summary>
+        /// <param name="containerName">Name of the container.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="imageName">Name of the image.</param>
+        /// <param name="networkServices">The network services.</param>
+        /// <param name="hostFolder">The host folder.</param>
+        /// <param name="dockerCredentials">The docker credentials.</param>
+        /// <param name="securityServiceContainerName">Name of the security service container.</param>
+        /// <param name="eventStoreConnectionString">The event store connection string.</param>
+        /// <param name="sqlServerDetails">The SQL server details.</param>
+        /// <param name="clientDetails">The client details.</param>
+        /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
+        /// <param name="securityServicePort">The security service port.</param>
+        /// <param name="additionalEnvironmentVariables">The additional environment variables.</param>
+        /// <returns></returns>
+        public static IContainerService SetupEstateReportingContainer(String containerName,
+                                                                      ILogger logger,
+                                                                      String imageName,
+                                                                      List<INetworkService> networkServices,
+                                                                      String hostFolder,
+                                                                      (String URL, String UserName, String Password)? dockerCredentials,
+                                                                      String securityServiceContainerName,
+                                                                      String eventStoreConnectionString,
+                                                                      (String sqlServerContainerName, String sqlServerUserName, String sqlServerPassword)
+                                                                          sqlServerDetails,
+                                                                      (String clientId, String clientSecret) clientDetails,
+                                                                      Boolean forceLatestImage = false,
+                                                                      Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort,
+                                                                      List<String> additionalEnvironmentVariables = null)
+        {
+            logger.LogInformation("About to Start Estate Reporting Container");
+
+            List<String> environmentVariables = new List<String>();
+            environmentVariables.Add($"AppSettings:SecurityService=https://{securityServiceContainerName}:{securityServicePort}");
+            environmentVariables.Add($"EventStoreSettings:ConnectionString={eventStoreConnectionString}");
+            environmentVariables.Add($"SecurityConfiguration:Authority=https://{securityServiceContainerName}:{securityServicePort}");
+            environmentVariables.Add($"urls=http://*:{DockerHelper.EstateReportingDockerPort}");
+            environmentVariables
+                .Add($"ConnectionStrings:EstateReportingReadModel=\"server={sqlServerDetails.sqlServerContainerName};user id={sqlServerDetails.sqlServerUserName};password={sqlServerDetails.sqlServerPassword};database=EstateReportingReadModel\"");
+
+            if (additionalEnvironmentVariables != null)
+            {
+                environmentVariables.AddRange(additionalEnvironmentVariables);
+            }
+
+            ContainerBuilder estateReportingContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
+                                                                     .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.EstateReportingDockerPort)
+                                                                     .UseNetwork(networkServices.ToArray());
+
+            if (string.IsNullOrEmpty(hostFolder) == false)
+            {
+                estateReportingContainer = estateReportingContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
+            }
+
+            if (dockerCredentials.HasValue)
+            {
+                estateReportingContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
+            }
+
+            // Now build and return the container                
+            IContainerService builtContainer = estateReportingContainer.Build().Start().WaitForPort($"{DockerHelper.EstateReportingDockerPort}/tcp", 30000);
+
+            logger.LogInformation("Estate Reporting Container Started");
+
+            return builtContainer;
+        }
+
+        /// <summary>
+        /// Setups the event store container.
+        /// </summary>
+        /// <param name="containerName">Name of the container.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="imageName">Name of the image.</param>
+        /// <param name="networkService">The network service.</param>
+        /// <param name="hostFolder">The host folder.</param>
+        /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
+        /// <returns></returns>
+        public static IContainerService SetupEventStoreContainer(String containerName,
+                                                                 ILogger logger,
+                                                                 String imageName,
+                                                                 INetworkService networkService,
+                                                                 String hostFolder,
+                                                                 Boolean forceLatestImage = false)
+        {
+            logger.LogInformation("About to Start Event Store Container");
+
+            List<String> environmentVariables = new List<String>();
+            environmentVariables.Add("EVENTSTORE_RUN_PROJECTIONS=all");
+            environmentVariables.Add("EVENTSTORE_START_STANDARD_PROJECTIONS=true");
+            environmentVariables.Add("EVENTSTORE_INSECURE=true");
+            environmentVariables.Add("EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP=true");
+            environmentVariables.Add("EVENTSTORE_ENABLE_EXTERNAL_TCP=true");
+
+            var eventStoreContainerBuilder = new Builder().UseContainer().UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.EventStoreHttpDockerPort)
+                                                          .ExposePort(DockerHelper.EventStoreTcpDockerPort).WithName(containerName)
+                                                          .WithEnvironment(environmentVariables.ToArray()).UseNetwork(networkService);
+
+            if (string.IsNullOrEmpty(hostFolder) == false)
+            {
+                eventStoreContainerBuilder = eventStoreContainerBuilder.Mount(hostFolder, "/var/log/eventstore", MountType.ReadWrite);
+            }
+
+            IContainerService eventStoreContainer = eventStoreContainerBuilder.Build().Start().WaitForPort("2113/tcp", 30000);
+
+            logger.LogInformation("Event Store Container Started");
+
+            return eventStoreContainer;
+        }
+
+        /// <summary>
+        /// Setups the messaging service container.
+        /// </summary>
+        /// <param name="containerName">Name of the container.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="imageName">Name of the image.</param>
+        /// <param name="networkServices">The network services.</param>
+        /// <param name="hostFolder">The host folder.</param>
+        /// <param name="dockerCredentials">The docker credentials.</param>
+        /// <param name="securityServiceContainerName">Name of the security service container.</param>
+        /// <param name="eventStoreConnectionString">The event store connection string.</param>
+        /// <param name="clientDetails">The client details.</param>
+        /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
+        /// <param name="securityServicePort">The security service port.</param>
+        /// <returns></returns>
+        public static IContainerService SetupMessagingServiceContainer(String containerName,
+                                                                       ILogger logger,
+                                                                       String imageName,
+                                                                       List<INetworkService> networkServices,
+                                                                       String hostFolder,
+                                                                       (String URL, String UserName, String Password)? dockerCredentials,
+                                                                       String securityServiceContainerName,
+                                                                       String eventStoreConnectionString,
+                                                                       (String clientId, String clientSecret) clientDetails,
+                                                                       Boolean forceLatestImage = false,
+                                                                       Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort)
+        {
+            logger.LogInformation("About to Start Messaging Service Container");
+
+            List<String> environmentVariables = new List<String>();
+            environmentVariables.Add($"EventStoreSettings:ConnectionString={eventStoreConnectionString}");
+            environmentVariables.Add($"AppSettings:SecurityService=https://{securityServiceContainerName}:{securityServicePort}");
+            environmentVariables.Add($"SecurityConfiguration:Authority=https://{securityServiceContainerName}:{securityServicePort}");
+            environmentVariables.Add($"urls=http://*:{DockerHelper.MessagingServiceDockerPort}");
+            environmentVariables.Add("AppSettings:EmailProxy=Integration");
+            environmentVariables.Add("AppSettings:SMSProxy=Integration");
+
+            ContainerBuilder messagingServiceContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
+                                                                      .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.MessagingServiceDockerPort)
+                                                                      .UseNetwork(networkServices.ToArray()); //.Mount(hostFolder, "/home", MountType.ReadWrite);
+
+            if (string.IsNullOrEmpty(hostFolder) == false)
+            {
+                messagingServiceContainer = messagingServiceContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
+            }
+
+            if (dockerCredentials.HasValue)
+            {
+                messagingServiceContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
+            }
+
+            // Now build and return the container                
+            IContainerService builtContainer = messagingServiceContainer.Build().Start().WaitForPort($"{DockerHelper.MessagingServiceDockerPort}/tcp", 30000);
+
+            logger.LogInformation("Messaging Service Container Started");
 
             return builtContainer;
         }
-        
+
         /// <summary>
         /// Setups the security service container.
         /// </summary>
@@ -124,7 +299,7 @@ public static IContainerService SetupSecurityServiceContainer(String containerNa
                                                                                      networkService
                                                                                  }.ToArray());
 
-            if (String.IsNullOrEmpty(hostFolder) == false)
+            if (string.IsNullOrEmpty(hostFolder) == false)
             {
                 securityServiceContainer = securityServiceContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
             }
@@ -142,7 +317,52 @@ public static IContainerService SetupSecurityServiceContainer(String containerNa
 
             return builtContainer;
         }
-        
+
+        /// <summary>
+        /// Setups the test host container.
+        /// </summary>
+        /// <param name="containerName">Name of the container.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="imageName">Name of the image.</param>
+        /// <param name="networkServices">The network services.</param>
+        /// <param name="hostFolder">The host folder.</param>
+        /// <param name="dockerCredentials">The docker credentials.</param>
+        /// <param name="sqlServerDetails">The SQL server details.</param>
+        /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
+        /// <returns></returns>
+        public static IContainerService SetupTestHostContainer(String containerName,
+                                                               ILogger logger,
+                                                               String imageName,
+                                                               List<INetworkService> networkServices,
+                                                               String hostFolder,
+                                                               (String URL, String UserName, String Password)? dockerCredentials,
+                                                               (String sqlServerContainerName, String sqlServerUserName, String sqlServerPassword) sqlServerDetails,
+                                                               Boolean forceLatestImage = false)
+        {
+            logger.LogInformation("About to Start Test Hosts Container");
+
+            List<String> environmentVariables = new List<String>();
+            environmentVariables
+                .Add($"ConnectionStrings:TestBankReadModel=\"server={sqlServerDetails.sqlServerContainerName};user id={sqlServerDetails.sqlServerUserName};password={sqlServerDetails.sqlServerPassword};database=TestBankReadModel\"");
+            environmentVariables.Add("ASPNETCORE_ENVIRONMENT=IntegrationTest");
+
+            ContainerBuilder testHostContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
+                                                              .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.TestHostPort)
+                                                              .UseNetwork(networkServices.ToArray()).Mount(hostFolder, "/home", MountType.ReadWrite);
+
+            if (dockerCredentials.HasValue)
+            {
+                testHostContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
+            }
+
+            // Now build and return the container                
+            IContainerService builtContainer = testHostContainer.Build().Start().WaitForPort($"{DockerHelper.TestHostPort}/tcp", 30000);
+
+            logger.LogInformation("Test Hosts Container Started");
+
+            return builtContainer;
+        }
+
         /// <summary>
         /// Setups the test network.
         /// </summary>
@@ -217,7 +437,7 @@ public static IContainerService SetupTransactionProcessorACLContainer(String con
                                                                                              networkService
                                                                                          }.ToArray());
 
-            if (String.IsNullOrEmpty(hostFolder) == false)
+            if (string.IsNullOrEmpty(hostFolder) == false)
             {
                 transactionProcessorACLContainer = transactionProcessorACLContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
             }
@@ -235,27 +455,243 @@ public static IContainerService SetupTransactionProcessorACLContainer(String con
 
             return builtContainer;
         }
-        
-        /// <summary>
-        /// Starts the containers for scenario run.
-        /// </summary>
-        /// <param name="scenarioName">Name of the scenario.</param>
-        /// <returns></returns>
-        public abstract Task StartContainersForScenarioRun(String scenarioName);
 
         /// <summary>
-        /// Starts the SQL container with open connection.
+        /// Setups the transaction processor container.
         /// </summary>
         /// <param name="containerName">Name of the container.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="imageName">Name of the image.</param>
-        /// <param name="networkService">The network service.</param>
+        /// <param name="networkServices">The network services.</param>
         /// <param name="hostFolder">The host folder.</param>
         /// <param name="dockerCredentials">The docker credentials.</param>
-        /// <param name="sqlUserName">Name of the SQL user.</param>
-        /// <param name="sqlPassword">The SQL password.</param>
-        /// <returns></returns>
-        public static IContainerService StartSqlContainerWithOpenConnection(String containerName,
+        /// <param name="securityServiceContainerName">Name of the security service container.</param>
+        /// <param name="estateManagementContainerName">Name of the estate management container.</param>
+        /// <param name="eventStoreConnectionString">The event store connection string.</param>
+        /// <param name="clientDetails">The client details.</param>
+        /// <param name="testhostContainerName">Name of the testhost container.</param>
+        /// <param name="voucherManagementContainerName">Name of the voucher management container.</param>
+        /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
+        /// <param name="securityServicePort">The security service port.</param>
+        /// <param name="additionalEnvironmentVariables">The additional environment variables.</param>
+        /// <returns></returns>
+        public static IContainerService SetupTransactionProcessorContainer(String containerName,
+                                                                           ILogger logger,
+                                                                           String imageName,
+                                                                           List<INetworkService> networkServices,
+                                                                           String hostFolder,
+                                                                           (String URL, String UserName, String Password)? dockerCredentials,
+                                                                           String securityServiceContainerName,
+                                                                           String estateManagementContainerName,
+                                                                           String eventStoreConnectionString,
+                                                                           (String clientId, String clientSecret) clientDetails,
+                                                                           String testhostContainerName,
+                                                                           String voucherManagementContainerName,
+                                                                           Boolean forceLatestImage = false,
+                                                                           Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort,
+                                                                           List<String> additionalEnvironmentVariables = null)
+        {
+            logger.LogInformation("About to Start Transaction Processor Container");
+
+            List<String> environmentVariables = new List<String>();
+            environmentVariables.Add($"EventStoreSettings:ConnectionString={eventStoreConnectionString}");
+            environmentVariables.Add($"AppSettings:SecurityService=https://{securityServiceContainerName}:{securityServicePort}");
+            environmentVariables.Add($"AppSettings:EstateManagementApi=http://{estateManagementContainerName}:{DockerHelper.EstateManagementDockerPort}");
+            environmentVariables.Add($"AppSettings:VoucherManagementApi=http://{voucherManagementContainerName}:{DockerHelper.VoucherManagementDockerPort}");
+            environmentVariables.Add($"SecurityConfiguration:Authority=https://{securityServiceContainerName}:{securityServicePort}");
+            environmentVariables.Add($"urls=http://*:{DockerHelper.TransactionProcessorDockerPort}");
+            environmentVariables.Add($"AppSettings:ClientId={clientDetails.clientId}");
+            environmentVariables.Add($"AppSettings:ClientSecret={clientDetails.clientSecret}");
+            environmentVariables.Add("AppSettings:SubscriptionFilter=TransactionProcessor");
+
+            environmentVariables.Add($"OperatorConfiguration:Safaricom:Url=http://{testhostContainerName}:9000/api/safaricom");
+
+            if (additionalEnvironmentVariables != null)
+            {
+                environmentVariables.AddRange(additionalEnvironmentVariables);
+            }
+
+            ContainerBuilder transactionProcessorContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
+                                                                          .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.TransactionProcessorDockerPort)
+                                                                          .UseNetwork(networkServices.ToArray());
+
+            if (string.IsNullOrEmpty(hostFolder) == false)
+            {
+                transactionProcessorContainer = transactionProcessorContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
+            }
+
+            if (dockerCredentials.HasValue)
+            {
+                transactionProcessorContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
+            }
+
+            // Now build and return the container                
+            IContainerService builtContainer = transactionProcessorContainer.Build().Start().WaitForPort($"{DockerHelper.TransactionProcessorDockerPort}/tcp", 30000);
+
+            logger.LogInformation("Transaction Processor Container Started");
+
+            return builtContainer;
+        }
+
+        /// <summary>
+        /// Setups the voucher management acl container.
+        /// </summary>
+        /// <param name="containerName">Name of the container.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="imageName">Name of the image.</param>
+        /// <param name="networkServices">The network services.</param>
+        /// <param name="hostFolder">The host folder.</param>
+        /// <param name="dockerCredentials">The docker credentials.</param>
+        /// <param name="securityServiceContainerName">Name of the security service container.</param>
+        /// <param name="voucherManagementContainerName">Name of the voucher management container.</param>
+        /// <param name="clientDetails">The client details.</param>
+        /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
+        /// <param name="securityServicePort">The security service port.</param>
+        /// <param name="additionalEnvironmentVariables">The additional environment variables.</param>
+        /// <returns></returns>
+        public static IContainerService SetupVoucherManagementACLContainer(String containerName,
+                                                                           ILogger logger,
+                                                                           String imageName,
+                                                                           List<INetworkService> networkServices,
+                                                                           String hostFolder,
+                                                                           (String URL, String UserName, String Password)? dockerCredentials,
+                                                                           String securityServiceContainerName,
+                                                                           String voucherManagementContainerName,
+                                                                           (String clientId, String clientSecret) clientDetails,
+                                                                           Boolean forceLatestImage = false,
+                                                                           Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort,
+                                                                           List<String> additionalEnvironmentVariables = null)
+        {
+            logger.LogInformation("About to Start Voucher Management ACL Container");
+
+            List<String> environmentVariables = new List<String>();
+            environmentVariables.Add($"AppSettings:SecurityService=https://{securityServiceContainerName}:{securityServicePort}");
+            environmentVariables.Add($"AppSettings:VoucherManagementApi=http://{voucherManagementContainerName}:{DockerHelper.VoucherManagementDockerPort}");
+            environmentVariables.Add($"SecurityConfiguration:Authority=https://{securityServiceContainerName}:{securityServicePort}");
+            environmentVariables.Add($"urls=http://*:{DockerHelper.VoucherManagementACLDockerPort}");
+            environmentVariables.Add($"AppSettings:ClientId={clientDetails.clientId}");
+            environmentVariables.Add($"AppSettings:ClientSecret={clientDetails.clientSecret}");
+
+            if (additionalEnvironmentVariables != null)
+            {
+                environmentVariables.AddRange(additionalEnvironmentVariables);
+            }
+
+            ContainerBuilder voucherManagementAclContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
+                                                                          .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.VoucherManagementACLDockerPort)
+                                                                          .UseNetwork(networkServices.ToArray());
+            if (string.IsNullOrEmpty(hostFolder) == false)
+            {
+                voucherManagementAclContainer = voucherManagementAclContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
+            }
+
+            if (dockerCredentials.HasValue)
+            {
+                voucherManagementAclContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
+            }
+
+            // Now build and return the container                
+            IContainerService builtContainer = voucherManagementAclContainer.Build().Start().WaitForPort($"{DockerHelper.VoucherManagementACLDockerPort}/tcp", 30000);
+
+            logger.LogInformation("Voucher Management ACL Container Started");
+
+            return builtContainer;
+        }
+
+        /// <summary>
+        /// Setups the voucher management container.
+        /// </summary>
+        /// <param name="containerName">Name of the container.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="imageName">Name of the image.</param>
+        /// <param name="networkServices">The network services.</param>
+        /// <param name="hostFolder">The host folder.</param>
+        /// <param name="dockerCredentials">The docker credentials.</param>
+        /// <param name="securityServiceContainerName">Name of the security service container.</param>
+        /// <param name="estateManagementContainerName">Name of the estate management container.</param>
+        /// <param name="eventStoreConnectionString">The event store connection string.</param>
+        /// <param name="sqlServerDetails">The SQL server details.</param>
+        /// <param name="clientDetails">The client details.</param>
+        /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
+        /// <param name="securityServicePort">The security service port.</param>
+        /// <param name="additionalEnvironmentVariables">The additional environment variables.</param>
+        /// <returns></returns>
+        public static IContainerService SetupVoucherManagementContainer(String containerName,
+                                                                        ILogger logger,
+                                                                        String imageName,
+                                                                        List<INetworkService> networkServices,
+                                                                        String hostFolder,
+                                                                        (String URL, String UserName, String Password)? dockerCredentials,
+                                                                        String securityServiceContainerName,
+                                                                        String estateManagementContainerName,
+                                                                        String eventStoreConnectionString,
+                                                                        (String sqlServerContainerName, String sqlServerUserName, String sqlServerPassword)
+                                                                            sqlServerDetails,
+                                                                        (String clientId, String clientSecret) clientDetails,
+                                                                        Boolean forceLatestImage = false,
+                                                                        Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort,
+                                                                        List<String> additionalEnvironmentVariables = null)
+        {
+            logger.LogInformation("About to Start Voucher Management Container");
+
+            List<String> environmentVariables = new List<String>();
+            environmentVariables.Add($"EventStoreSettings:ConnectionString={eventStoreConnectionString}");
+            environmentVariables.Add($"AppSettings:SecurityService=https://{securityServiceContainerName}:{securityServicePort}");
+            environmentVariables.Add($"AppSettings:EstateManagementApi=http://{estateManagementContainerName}:{DockerHelper.EstateManagementDockerPort}");
+            environmentVariables.Add($"SecurityConfiguration:Authority=https://{securityServiceContainerName}:{securityServicePort}");
+            environmentVariables.Add($"urls=http://*:{DockerHelper.VoucherManagementDockerPort}");
+            environmentVariables.Add($"AppSettings:ClientId={clientDetails.clientId}");
+            environmentVariables.Add($"AppSettings:ClientSecret={clientDetails.clientSecret}");
+            environmentVariables
+                .Add($"ConnectionStrings:EstateReportingReadModel=\"server={sqlServerDetails.sqlServerContainerName};user id={sqlServerDetails.sqlServerUserName};password={sqlServerDetails.sqlServerPassword};database=EstateReportingReadModel\"");
+
+            if (additionalEnvironmentVariables != null)
+            {
+                environmentVariables.AddRange(additionalEnvironmentVariables);
+            }
+
+            ContainerBuilder voucherManagementContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
+                                                                       .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.VoucherManagementDockerPort)
+                                                                       .UseNetwork(networkServices.ToArray());
+
+            if (string.IsNullOrEmpty(hostFolder) == false)
+            {
+                voucherManagementContainer = voucherManagementContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
+            }
+
+            if (dockerCredentials.HasValue)
+            {
+                voucherManagementContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
+            }
+
+            // Now build and return the container                
+            IContainerService builtContainer = voucherManagementContainer.Build().Start().WaitForPort($"{DockerHelper.VoucherManagementDockerPort}/tcp", 30000);
+
+            logger.LogInformation("Voucher Management  Container Started");
+
+            return builtContainer;
+        }
+
+        /// <summary>
+        /// Starts the containers for scenario run.
+        /// </summary>
+        /// <param name="scenarioName">Name of the scenario.</param>
+        /// <returns></returns>
+        public abstract Task StartContainersForScenarioRun(String scenarioName);
+
+        /// <summary>
+        /// Starts the SQL container with open connection.
+        /// </summary>
+        /// <param name="containerName">Name of the container.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="imageName">Name of the image.</param>
+        /// <param name="networkService">The network service.</param>
+        /// <param name="hostFolder">The host folder.</param>
+        /// <param name="dockerCredentials">The docker credentials.</param>
+        /// <param name="sqlUserName">Name of the SQL user.</param>
+        /// <param name="sqlPassword">The SQL password.</param>
+        /// <returns></returns>
+        public static IContainerService StartSqlContainerWithOpenConnection(String containerName,
                                                                             ILogger logger,
                                                                             String imageName,
                                                                             INetworkService networkService,
@@ -356,11 +792,21 @@ public static IContainerService StartSqlContainerWithOpenConnection(String conta
         /// </summary>
         public const Int32 EventStoreTcpDockerPort = 1113;
 
+        /// <summary>
+        /// The messaging service docker port
+        /// </summary>
+        public const Int32 MessagingServiceDockerPort = 5006;
+
         /// <summary>
         /// The security service docker port
         /// </summary>
         public const Int32 SecurityServiceDockerPort = 5001;
 
+        /// <summary>
+        /// The test host port
+        /// </summary>
+        public const Int32 TestHostPort = 9000;
+
         /// <summary>
         /// The transaction processor acl docker port
         /// </summary>
@@ -371,413 +817,16 @@ public static IContainerService StartSqlContainerWithOpenConnection(String conta
         /// </summary>
         public const Int32 TransactionProcessorDockerPort = 5002;
 
-        /// <summary>
-        /// The voucher management docker port
-        /// </summary>
-        public const Int32 VoucherManagementDockerPort = 5007;
         /// <summary>
         /// The voucher management acl docker port
         /// </summary>
         public const Int32 VoucherManagementACLDockerPort = 5008;
 
-        public const Int32 TestHostPort = 9000;
-
-        #endregion
-
-        public static IContainerService SetupTestHostContainer(String containerName, ILogger logger, String imageName,
-                                                               List<INetworkService> networkServices,
-                                                               String hostFolder,
-                                                               (String URL, String UserName, String Password)? dockerCredentials,
-                                                               (String sqlServerContainerName, String sqlServerUserName, String sqlServerPassword)
-                                                                   sqlServerDetails,
-                                                               Boolean forceLatestImage = false)
-        {
-            logger.LogInformation("About to Start Test Hosts Container");
-
-            List<String> environmentVariables = new List<String>();
-            environmentVariables
-                .Add($"ConnectionStrings:TestBankReadModel=\"server={sqlServerDetails.sqlServerContainerName};user id={sqlServerDetails.sqlServerUserName};password={sqlServerDetails.sqlServerPassword};database=TestBankReadModel\"");
-            environmentVariables.Add("ASPNETCORE_ENVIRONMENT=IntegrationTest");
-
-            ContainerBuilder testHostContainer = new Builder().UseContainer().WithName(containerName)
-                                                              .WithEnvironment(environmentVariables.ToArray())
-                                                              .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.TestHostPort)
-                                                              .UseNetwork(networkServices.ToArray()).Mount(hostFolder, "/home", MountType.ReadWrite);
-
-            if (dockerCredentials.HasValue)
-            {
-                testHostContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
-            }
-
-            // Now build and return the container                
-            IContainerService builtContainer = testHostContainer.Build().Start().WaitForPort($"{DockerHelper.TestHostPort}/tcp", 30000);
-
-            logger.LogInformation("Test Hosts Container Started");
-
-            return builtContainer;
-        }
-
         /// <summary>
-        /// Setups the voucher management container.
+        /// The voucher management docker port
         /// </summary>
-        /// <param name="containerName">Name of the container.</param>
-        /// <param name="logger">The logger.</param>
-        /// <param name="imageName">Name of the image.</param>
-        /// <param name="networkServices">The network services.</param>
-        /// <param name="hostFolder">The host folder.</param>
-        /// <param name="dockerCredentials">The docker credentials.</param>
-        /// <param name="securityServiceContainerName">Name of the security service container.</param>
-        /// <param name="estateManagementContainerName">Name of the estate management container.</param>
-        /// <param name="eventStoreContainerName">Name of the event store container.</param>
-        /// <param name="sqlServerDetails">The SQL server details.</param>
-        /// <param name="clientDetails">The client details.</param>
-        /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
-        /// <param name="securityServicePort">The security service port.</param>
-        /// <param name="additionalEnvironmentVariables">The additional environment variables.</param>
-        /// <returns></returns>
-        public static IContainerService SetupVoucherManagementContainer(String containerName, ILogger logger, String imageName,
-                                                               List<INetworkService> networkServices,
-                                                               String hostFolder,
-                                                               (String URL, String UserName, String Password)? dockerCredentials,
-                                                               String securityServiceContainerName,
-                                                               String estateManagementContainerName,
-                                                               String eventStoreAddress,
-                                                               (String sqlServerContainerName, String sqlServerUserName, String sqlServerPassword)
-                                                                   sqlServerDetails,
-                                                               (string clientId, string clientSecret) clientDetails,
-                                                               Boolean forceLatestImage = false,
-                                                               Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort,
-                                                               List<String> additionalEnvironmentVariables = null)
-        {
-            logger.LogInformation("About to Start Voucher Management Container");
-
-            List<String> environmentVariables = new List<String>();
-            environmentVariables.Add($"EventStoreSettings:ConnectionString={eventStoreAddress}:{DockerHelper.EventStoreHttpDockerPort}");
-            environmentVariables.Add($"AppSettings:SecurityService=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"AppSettings:EstateManagementApi=http://{estateManagementContainerName}:{DockerHelper.EstateManagementDockerPort}");
-            environmentVariables.Add($"SecurityConfiguration:Authority=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"urls=http://*:{DockerHelper.VoucherManagementDockerPort}");
-            environmentVariables.Add($"AppSettings:ClientId={clientDetails.clientId}");
-            environmentVariables.Add($"AppSettings:ClientSecret={clientDetails.clientSecret}");
-            environmentVariables
-                .Add($"ConnectionStrings:EstateReportingReadModel=\"server={sqlServerDetails.sqlServerContainerName};user id={sqlServerDetails.sqlServerUserName};password={sqlServerDetails.sqlServerPassword};database=EstateReportingReadModel\"");
-
-            if (additionalEnvironmentVariables != null)
-            {
-                environmentVariables.AddRange(additionalEnvironmentVariables);
-            }
-
-            ContainerBuilder voucherManagementContainer = new Builder().UseContainer().WithName(containerName)
-                                                                       .WithEnvironment(environmentVariables.ToArray())
-                                                              .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.VoucherManagementDockerPort)
-                                                              .UseNetwork(networkServices.ToArray());
-
-            if (String.IsNullOrEmpty(hostFolder) == false)
-            {
-                voucherManagementContainer = voucherManagementContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
-            }
-
-            if (dockerCredentials.HasValue)
-            {
-                voucherManagementContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
-            }
-
-            // Now build and return the container                
-            IContainerService builtContainer = voucherManagementContainer.Build().Start().WaitForPort($"{DockerHelper.VoucherManagementDockerPort}/tcp", 30000);
-
-            logger.LogInformation("Voucher Management  Container Started");
-
-            return builtContainer;
-        }
-
-        /// <summary>
-        /// Setups the estate management container.
-        /// </summary>
-        /// <param name="containerName">Name of the container.</param>
-        /// <param name="logger">The logger.</param>
-        /// <param name="imageName">Name of the image.</param>
-        /// <param name="networkServices">The network services.</param>
-        /// <param name="hostFolder">The host folder.</param>
-        /// <param name="dockerCredentials">The docker credentials.</param>
-        /// <param name="securityServiceContainerName">Name of the security service container.</param>
-        /// <param name="eventStoreAddress">The event store address.</param>
-        /// <param name="sqlServerDetails">The SQL server details.</param>
-        /// <param name="clientDetails">The client details.</param>
-        /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
-        /// <param name="securityServicePort">The security service port.</param>
-        /// <param name="additionalEnvironmentVariables">The additional environment variables.</param>
-        /// <returns></returns>
-        public static IContainerService SetupEstateManagementContainer(String containerName,
-                                                                       ILogger logger,
-                                                                       String imageName,
-                                                                       List<INetworkService> networkServices,
-                                                                       String hostFolder,
-                                                                       (String URL, String UserName, String Password)? dockerCredentials,
-                                                                       String securityServiceContainerName,
-                                                                       String eventStoreAddress,
-                                                                       (String sqlServerContainerName, String sqlServerUserName, String sqlServerPassword)
-                                                                           sqlServerDetails,
-                                                                       (String clientId, String clientSecret) clientDetails,
-                                                                       Boolean forceLatestImage = false,
-                                                                       Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort,
-                                                                       List<String> additionalEnvironmentVariables = null)
-        {
-            logger.LogInformation("About to Start Estate Management Container");
-
-            List<String> environmentVariables = new List<String>();
-            environmentVariables.Add($"EventStoreSettings:ConnectionString={eventStoreAddress}:{DockerHelper.EventStoreHttpDockerPort}");
-            environmentVariables.Add($"AppSettings:SecurityService=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"SecurityConfiguration:Authority=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"urls=http://*:{DockerHelper.EstateManagementDockerPort}");
-            environmentVariables
-                .Add($"ConnectionStrings:EstateReportingReadModel=\"server={sqlServerDetails.sqlServerContainerName};user id={sqlServerDetails.sqlServerUserName};password={sqlServerDetails.sqlServerPassword};database=EstateReportingReadModel\"");
-
-            if (additionalEnvironmentVariables != null)
-            {
-                environmentVariables.AddRange(additionalEnvironmentVariables);
-            }
-
-            ContainerBuilder estateManagementContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
-                                                                      .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.EstateManagementDockerPort)
-                                                                      .UseNetwork(networkServices.ToArray());
-            if (String.IsNullOrEmpty(hostFolder) == false)
-            {
-                estateManagementContainer = estateManagementContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
-            }
-
-            if (dockerCredentials.HasValue)
-            {
-                estateManagementContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
-            }
-
-            // Now build and return the container                
-            IContainerService builtContainer = estateManagementContainer.Build().Start().WaitForPort($"{DockerHelper.EstateManagementDockerPort}/tcp", 30000);
-
-            logger.LogInformation("Estate Management Container Started");
-
-            return builtContainer;
-        }
-
-        /// <summary>
-        /// Setups the estate reporting container.
-        /// </summary>
-        /// <param name="containerName">Name of the container.</param>
-        /// <param name="logger">The logger.</param>
-        /// <param name="imageName">Name of the image.</param>
-        /// <param name="networkServices">The network services.</param>
-        /// <param name="hostFolder">The host folder.</param>
-        /// <param name="dockerCredentials">The docker credentials.</param>
-        /// <param name="securityServiceContainerName">Name of the security service container.</param>
-        /// <param name="sqlServerDetails">The SQL server details.</param>
-        /// <param name="clientDetails">The client details.</param>
-        /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
-        /// <param name="securityServicePort">The security service port.</param>
-        /// <param name="additionalEnvironmentVariables">The additional environment variables.</param>
-        /// <returns></returns>
-        public static IContainerService SetupEstateReportingContainer(String containerName,
-                                                                      ILogger logger,
-                                                                      String imageName,
-                                                                      List<INetworkService> networkServices,
-                                                                      String hostFolder,
-                                                                      (String URL, String UserName, String Password)? dockerCredentials,
-                                                                      String securityServiceContainerName,
-                                                                      String eventStoreAddress,
-                                                                      (String sqlServerContainerName, String sqlServerUserName, String sqlServerPassword)
-                                                                          sqlServerDetails,
-                                                                      (String clientId, String clientSecret) clientDetails,
-                                                                      Boolean forceLatestImage = false,
-                                                                      Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort,
-                                                                      List<String> additionalEnvironmentVariables = null)
-        {
-            logger.LogInformation("About to Start Estate Reporting Container");
-
-            List<String> environmentVariables = new List<String>();
-            environmentVariables.Add($"AppSettings:SecurityService=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"EventStoreSettings:ConnectionString={eventStoreAddress}:{DockerHelper.EventStoreHttpDockerPort}");
-            environmentVariables.Add($"SecurityConfiguration:Authority=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"urls=http://*:{DockerHelper.EstateReportingDockerPort}");
-            environmentVariables
-                .Add($"ConnectionStrings:EstateReportingReadModel=\"server={sqlServerDetails.sqlServerContainerName};user id={sqlServerDetails.sqlServerUserName};password={sqlServerDetails.sqlServerPassword};database=EstateReportingReadModel\"");
-
-            if (additionalEnvironmentVariables != null)
-            {
-                environmentVariables.AddRange(additionalEnvironmentVariables);
-            }
-
-            ContainerBuilder estateReportingContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
-                                                                     .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.EstateReportingDockerPort)
-                                                                     .UseNetwork(networkServices.ToArray());
-
-            if (String.IsNullOrEmpty(hostFolder) == false)
-            {
-                estateReportingContainer = estateReportingContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
-            }
-
-            if (dockerCredentials.HasValue)
-            {
-                estateReportingContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
-            }
-
-            // Now build and return the container                
-            IContainerService builtContainer = estateReportingContainer.Build().Start().WaitForPort($"{DockerHelper.EstateReportingDockerPort}/tcp", 30000);
-
-            logger.LogInformation("Estate Reporting Container Started");
-
-            return builtContainer;
-        }
-
-        /// <summary>
-        /// Setups the transaction processor container.
-        /// </summary>
-        /// <param name="containerName">Name of the container.</param>
-        /// <param name="logger">The logger.</param>
-        /// <param name="imageName">Name of the image.</param>
-        /// <param name="networkServices">The network services.</param>
-        /// <param name="hostFolder">The host folder.</param>
-        /// <param name="dockerCredentials">The docker credentials.</param>
-        /// <param name="securityServiceContainerName">Name of the security service container.</param>
-        /// <param name="estateManagementContainerName">Name of the estate management container.</param>
-        /// <param name="eventStoreAddress">The event store address.</param>
-        /// <param name="clientDetails">The client details.</param>
-        /// <param name="testhostContainerName">Name of the testhost container.</param>
-        /// <param name="voucherManagementContainerName">Name of the voucher management container.</param>
-        /// <param name="forceLatestImage">if set to <c>true</c> [force latest image].</param>
-        /// <param name="securityServicePort">The security service port.</param>
-        /// <param name="additionalEnvironmentVariables">The additional environment variables.</param>
-        /// <returns></returns>
-        public static IContainerService SetupTransactionProcessorContainer(String containerName,
-                                                                           ILogger logger,
-                                                                           String imageName,
-                                                                           List<INetworkService> networkServices,
-                                                                           String hostFolder,
-                                                                           (String URL, String UserName, String Password)? dockerCredentials,
-                                                                           String securityServiceContainerName,
-                                                                           String estateManagementContainerName,
-                                                                           String eventStoreAddress,
-                                                                           (String clientId, String clientSecret) clientDetails,
-                                                                           String testhostContainerName,
-                                                                           String voucherManagementContainerName,
-                                                                           Boolean forceLatestImage = false,
-                                                                           Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort,
-                                                                           List<String> additionalEnvironmentVariables = null)
-        {
-            logger.LogInformation("About to Start Transaction Processor Container");
-
-            List<String> environmentVariables = new List<String>();
-            environmentVariables.Add($"EventStoreSettings:ConnectionString={eventStoreAddress}:{DockerHelper.EventStoreHttpDockerPort}");
-            environmentVariables.Add($"AppSettings:SecurityService=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"AppSettings:EstateManagementApi=http://{estateManagementContainerName}:{DockerHelper.EstateManagementDockerPort}");
-            environmentVariables.Add($"AppSettings:VoucherManagementApi=http://{voucherManagementContainerName}:{DockerHelper.VoucherManagementDockerPort}");
-            environmentVariables.Add($"SecurityConfiguration:Authority=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"urls=http://*:{DockerHelper.TransactionProcessorDockerPort}");
-            environmentVariables.Add($"AppSettings:ClientId={clientDetails.clientId}");
-            environmentVariables.Add($"AppSettings:ClientSecret={clientDetails.clientSecret}");
-            environmentVariables.Add($"AppSettings:SubscriptionFilter=TransactionProcessor");
-
-            environmentVariables.Add($"OperatorConfiguration:Safaricom:Url=http://{testhostContainerName}:9000/api/safaricom");
-
-            if (additionalEnvironmentVariables != null)
-            {
-                environmentVariables.AddRange(additionalEnvironmentVariables);
-            }
-
-            ContainerBuilder transactionProcessorContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
-                                                                          .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.TransactionProcessorDockerPort)
-                                                                          .UseNetwork(networkServices.ToArray());
-
-            if (String.IsNullOrEmpty(hostFolder) == false)
-            {
-                transactionProcessorContainer = transactionProcessorContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
-            }
-            if (dockerCredentials.HasValue)
-            {
-                transactionProcessorContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
-            }
-
-            // Now build and return the container                
-            IContainerService builtContainer = transactionProcessorContainer.Build().Start().WaitForPort($"{DockerHelper.TransactionProcessorDockerPort}/tcp", 30000);
-
-            logger.LogInformation("Transaction Processor Container Started");
-
-            return builtContainer;
-        }
-
-        public static IContainerService SetupEventStoreContainer(String containerName,
-                                                                 ILogger logger,
-                                                                 String imageName,
-                                                                 INetworkService networkService,
-                                                                 String hostFolder,
-                                                                 Boolean forceLatestImage = false)
-        {
-            logger.LogInformation("About to Start Event Store Container");
-
-            List<String> environmentVariables = new List<String>();
-            environmentVariables.Add("EVENTSTORE_RUN_PROJECTIONS=all");
-            environmentVariables.Add("EVENTSTORE_START_STANDARD_PROJECTIONS=true");
-            environmentVariables.Add("EVENTSTORE_INSECURE=true");
-            environmentVariables.Add("EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP=true");
-            environmentVariables.Add("EVENTSTORE_ENABLE_EXTERNAL_TCP=true");
-
-            var eventStoreContainerBuilder = new Builder().UseContainer().UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.EventStoreHttpDockerPort)
-                                                          .ExposePort(DockerHelper.EventStoreTcpDockerPort).WithName(containerName)
-                                                          .WithEnvironment(environmentVariables.ToArray()).UseNetwork(networkService);
-
-            if (String.IsNullOrEmpty(hostFolder) == false)
-            {
-                eventStoreContainerBuilder = eventStoreContainerBuilder.Mount(hostFolder, "/var/log/eventstore", MountType.ReadWrite);
-            }
-
-            IContainerService eventStoreContainer = eventStoreContainerBuilder.Build().Start().WaitForPort("2113/tcp", 30000);
-
-            logger.LogInformation("Event Store Container Started");
-
-            return eventStoreContainer;
-        }
-
-        public const int MessagingServiceDockerPort = 5006;
-
-        public static IContainerService SetupMessagingServiceContainer(String containerName,
-                                                                       ILogger logger,
-                                                                       String imageName,
-                                                                       List<INetworkService> networkServices,
-                                                                       String hostFolder,
-                                                                       (String URL, String UserName, String Password)? dockerCredentials,
-                                                                       String securityServiceContainerName,
-                                                                       String eventStoreAddress,
-                                                                       (String clientId, String clientSecret) clientDetails,
-                                                                       Boolean forceLatestImage = false,
-                                                                       Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort)
-        {
-            logger.LogInformation("About to Start Messaging Service Container");
-
-            List<String> environmentVariables = new List<String>();
-            environmentVariables.Add($"EventStoreSettings:ConnectionString={eventStoreAddress}:{DockerHelper.EventStoreHttpDockerPort}");
-            environmentVariables.Add($"AppSettings:SecurityService=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"SecurityConfiguration:Authority=https://{securityServiceContainerName}:{securityServicePort}");
-            environmentVariables.Add($"urls=http://*:{DockerHelper.MessagingServiceDockerPort}");
-            environmentVariables.Add("AppSettings:EmailProxy=Integration");
-            environmentVariables.Add("AppSettings:SMSProxy=Integration");
-
-            ContainerBuilder messagingServiceContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray())
-                                                                      .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.MessagingServiceDockerPort)
-                                                                      .UseNetwork(networkServices.ToArray());//.Mount(hostFolder, "/home", MountType.ReadWrite);
-
-            if (String.IsNullOrEmpty(hostFolder) == false)
-            {
-                messagingServiceContainer = messagingServiceContainer.Mount(hostFolder, "/home/txnproc/trace", MountType.ReadWrite);
-            }
-
-            if (dockerCredentials.HasValue)
-            {
-                messagingServiceContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password);
-            }
-
-            // Now build and return the container                
-            IContainerService builtContainer = messagingServiceContainer.Build().Start().WaitForPort($"{DockerHelper.MessagingServiceDockerPort}/tcp", 30000);
-
-            logger.LogInformation("Messaging Service Container Started");
+        public const Int32 VoucherManagementDockerPort = 5007;
 
-            return builtContainer;
-        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index c3762605..ef0a1bac 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -13,12 +13,12 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NLog" Version="4.7.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.2">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.12">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.12" />
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>