diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/HostDaoJdbc.java b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/HostDaoJdbc.java
index 9007a5345..b3261c4c1 100644
--- a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/HostDaoJdbc.java
+++ b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/HostDaoJdbc.java
@@ -711,8 +711,8 @@ private String getHostNameFromFQDN(String fqdn, Boolean useLongNames) {
             hostName = fqdn;
         } else if (useLongNames) {
             hostName = fqdn;
-            Pattern domainPattern = Pattern
-                    .compile(".*(\\.(.*)\\.(co(m|.[a-z]{2})|biz|edu|info|net|org|cn|de|eu|nl))$");
+            Pattern domainPattern = Pattern.compile(
+                    ".*(\\.(.*)\\.(co(m|.[a-z]{2})|biz|edu|info|net|org|cn|de|eu|nl|local))$");
             Matcher domainMatcher = domainPattern.matcher(fqdn);
             if (domainMatcher.matches()) {
                 hostName = fqdn.replace(domainMatcher.group(1), "");
diff --git a/cuebot/src/main/java/com/imageworks/spcue/service/HostManagerService.java b/cuebot/src/main/java/com/imageworks/spcue/service/HostManagerService.java
index fbc57cf68..dbef43d76 100644
--- a/cuebot/src/main/java/com/imageworks/spcue/service/HostManagerService.java
+++ b/cuebot/src/main/java/com/imageworks/spcue/service/HostManagerService.java
@@ -164,7 +164,7 @@ public DispatchHost createHost(RenderHost rhost) {
     @Transactional(propagation = Propagation.REQUIRED)
     public DispatchHost createHost(RenderHost rhost, AllocationEntity alloc) {
 
-        hostDao.insertRenderHost(rhost, alloc, false);
+        hostDao.insertRenderHost(rhost, alloc, true);
         DispatchHost host = hostDao.findDispatchHost(rhost.getName());
 
         hostDao.tagHost(host, alloc.tag, HostTagType.ALLOC);