diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RegistryUtil.java b/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RegistryUtil.java
index 61861a742f..3224a71f15 100644
--- a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RegistryUtil.java
+++ b/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RegistryUtil.java
@@ -51,7 +51,6 @@ import com.raytheon.uf.common.registry.ebxml.slots.SlotConverter;
 import com.raytheon.uf.common.registry.ebxml.slots.StringSlotConverter;
 import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.time.util.ImmutableDate;
-import com.raytheon.uf.common.util.ClusterIdUtil;
 import com.raytheon.uf.common.util.CollectionUtil;
 import com.raytheon.uf.common.util.ReflectionException;
 import com.raytheon.uf.common.util.ReflectionUtil;
@@ -87,6 +86,7 @@ import com.raytheon.uf.common.util.ReflectionUtil;
  * Jul 10, 2014  1717     bphillip  Changed default user
  * Jul 28, 2014  3474     dhladky   Fixed bad default user settings.
  * Aug 25, 2016  5846     rjpeter   Remove InternationalString from DB
+ * Aug 08, 2018           mjames    Standalone Registry Configuration
  * 
  * </pre>
  * 
@@ -123,7 +123,8 @@ public final class RegistryUtil {
     /**
      * The default internal owner is the local registry ID
      */
-    public static final String registryUser = ClusterIdUtil.getId();
+
+    public static final String registryUser = System.getenv("AW_SITE_IDENTIFIER");
 
     // A private mapping of attribute types to slot types, used when storing an
     // object to the registry to map QueryableAttributes to SlotConverters.
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/RegistryFederationManager.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/RegistryFederationManager.java
index 1ff0575021..43fdf2790b 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/RegistryFederationManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/RegistryFederationManager.java
@@ -78,7 +78,6 @@ import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.time.util.TimeUtil;
-import com.raytheon.uf.common.util.ClusterIdUtil;
 import com.raytheon.uf.common.util.StringUtil;
 import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.database.DataAccessLayerException;
@@ -202,6 +201,7 @@ import oasis.names.tc.ebxml.regrep.xsd.rs.v4.RegistryRequestType;
  * Sep 01, 2016  5810     tjensen   Added improved logging messages
  * Sep 22, 2016  5762     tjensen   Harden replication code
  * Oct 04, 2016  5762     tjensen   Fix connection check
+ * Aug 08, 2018           mjames    Standalone Registry Configuration
  *
  * </pre>
  *
@@ -850,7 +850,7 @@ public class RegistryFederationManager
                  * duplicate data is not sent again
                  */
                 restClient.getRegistryFederationManager(remoteRegistryUrl)
-                        .updateRegistryEvents(ClusterIdUtil.getId(),
+                        .updateRegistryEvents(RegistryIdUtil.getId(),
                                 String.valueOf(start));
 
                 syncMsg.append("Registry synchronization using [")
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/RegistryIdUtil.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/RegistryIdUtil.java
index fca39b1817..a8c44344cd 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/RegistryIdUtil.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/RegistryIdUtil.java
@@ -21,7 +21,7 @@ package com.raytheon.uf.edex.registry.ebxml.util;
 
 import java.util.List;
 
-import com.raytheon.uf.common.util.ClusterIdUtil;
+import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.registry.ebxml.dao.RegistryObjectDao;
 
 /**
@@ -36,6 +36,7 @@ import com.raytheon.uf.edex.registry.ebxml.dao.RegistryObjectDao;
  * ------------ ---------- ----------- --------------------------
  * Feb 06, 2014 2771       bgonzale     Initial creation
  * Apr 23, 2014 2992       dhladky      General way to get all registries.
+ * Aug 08, 2018            mjames       Standalone Registry Configuration
  * 
  * </pre>
  * 
@@ -63,7 +64,7 @@ public class RegistryIdUtil {
      * @return Registry ID.
      */
     public static String getId() {
-        return ClusterIdUtil.getId();
+        return EDEXUtil.getEdexSite();
     }
     
     /**