diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs
index 1e0f5ac8..21df7dd0 100644
--- a/Oqtane.Client/Services/AliasService.cs
+++ b/Oqtane.Client/Services/AliasService.cs
@@ -5,16 +5,21 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Net;
 using System;
-
+using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
     public class AliasService : ServiceBase, IAliasService
     {
-        
-        public AliasService(HttpClient http) :base(http) { }
 
-        private string Apiurl => CreateApiUrl("Alias");
+        private readonly SiteState _siteState;
+
+        public AliasService(HttpClient http, SiteState siteState) : base(http)
+        {
+            _siteState = siteState;
+        }
+
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Alias");
 
         public async Task<List<Alias>> GetAliasesAsync()
         {
diff --git a/Oqtane.Client/Services/JobLogService.cs b/Oqtane.Client/Services/JobLogService.cs
index c15940b5..aa518771 100644
--- a/Oqtane.Client/Services/JobLogService.cs
+++ b/Oqtane.Client/Services/JobLogService.cs
@@ -3,14 +3,20 @@ using System.Threading.Tasks;
 using System.Net.Http;
 using System.Linq;
 using System.Collections.Generic;
+using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
     public class JobLogService : ServiceBase, IJobLogService
     {
-        public JobLogService(HttpClient http) :base(http) { }
+        private readonly SiteState _siteState;
 
-        private string Apiurl => CreateApiUrl("JobLog");
+        public JobLogService(HttpClient http, SiteState siteState) : base(http)
+        {
+            _siteState = siteState;
+        }
+
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "JobLog");
 
         public async Task<List<JobLog>> GetJobLogsAsync()
         {
diff --git a/Oqtane.Client/Services/JobService.cs b/Oqtane.Client/Services/JobService.cs
index 14cd96ad..3161cd90 100644
--- a/Oqtane.Client/Services/JobService.cs
+++ b/Oqtane.Client/Services/JobService.cs
@@ -3,15 +3,21 @@ using System.Threading.Tasks;
 using System.Net.Http;
 using System.Linq;
 using System.Collections.Generic;
+using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
     public class JobService : ServiceBase, IJobService
     {
-        public JobService(HttpClient http) : base(http) { }
+        private readonly SiteState _siteState;
 
-        private string Apiurl => CreateApiUrl("Job");
+        public JobService(HttpClient http, SiteState siteState) : base(http)
+        {
+            _siteState = siteState;
+        }
 
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Job");
+        
         public async Task<List<Job>> GetJobsAsync()
         {
             List<Job> jobs = await GetJsonAsync<List<Job>>(Apiurl);
diff --git a/Oqtane.Client/Services/ServiceBase.cs b/Oqtane.Client/Services/ServiceBase.cs
index 57bad2b7..091709f2 100644
--- a/Oqtane.Client/Services/ServiceBase.cs
+++ b/Oqtane.Client/Services/ServiceBase.cs
@@ -135,13 +135,13 @@ namespace Oqtane.Services
             //TODO Missing content JSON validation 
         }
 
-        // create an API Url which is tenant agnostic ( for use with entities in the MasterDB )
+        // create an API Url which is tenant agnostic ( for use during installation )
         public string CreateApiUrl(string serviceName)
         {
             return CreateApiUrl(null, serviceName);
         }
 
-        // create an API Url which is tenant aware ( for use with entities in the TenantDB )
+        // create an API Url which is tenant aware ( for use with repositories )
         public string CreateApiUrl(Alias alias, string serviceName)
         {
             string apiurl = "/";
diff --git a/Oqtane.Client/Services/SqlService.cs b/Oqtane.Client/Services/SqlService.cs
index a99fbd23..719156b2 100644
--- a/Oqtane.Client/Services/SqlService.cs
+++ b/Oqtane.Client/Services/SqlService.cs
@@ -1,4 +1,5 @@
 using Oqtane.Models;
+using Oqtane.Shared;
 using System.Net.Http;
 using System.Threading.Tasks;
 
@@ -6,9 +7,14 @@ namespace Oqtane.Services
 {
     public class SqlService : ServiceBase, ISqlService
     {
-        public SqlService(HttpClient http) : base(http) { }
+        private readonly SiteState _siteState;
 
-        private string Apiurl => CreateApiUrl("Sql");
+        public SqlService(HttpClient http, SiteState siteState) : base(http)
+        {
+            _siteState = siteState;
+        }
+
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Sql");
 
         public async Task<SqlQuery> ExecuteQueryAsync(SqlQuery sqlquery)
         {
diff --git a/Oqtane.Client/Services/TenantService.cs b/Oqtane.Client/Services/TenantService.cs
index d8e9be02..d644348e 100644
--- a/Oqtane.Client/Services/TenantService.cs
+++ b/Oqtane.Client/Services/TenantService.cs
@@ -3,14 +3,20 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.Linq;
+using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
     public class TenantService : ServiceBase, ITenantService
     {
-        public TenantService(HttpClient http) : base(http) { }
+        private readonly SiteState _siteState;
 
-        private string Apiurl => CreateApiUrl("Tenant");
+        public TenantService(HttpClient http, SiteState siteState) : base(http)
+        {
+            _siteState = siteState;
+        }
+
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Tenant");
 
         public async Task<List<Tenant>> GetTenantsAsync()
         {