diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 33ae61a6d5..1f6fcd4a52 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,6 +25,7 @@ on:
       - beta
       - master
       - staging
+      - typdef-ignore-atlas-core
 
 jobs:
   build:
diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStore.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStore.java
index 943336a47d..3d7d120cb6 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStore.java
+++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStore.java
@@ -125,19 +125,25 @@ public void init() throws AtlasBaseException {
     @Override
     public void reloadEnumTypeDefs() throws AtlasBaseException {
         LOG.info("==> AtlasTypeDefGraphStore.reloadEnumTypeDefs()");
-        AtlasTransientTypeRegistry ttr           = null;
-        boolean                    commitUpdates = false;
+        AtlasTransientTypeRegistry ttr = null;
+        boolean commitUpdates = false;
 
         try {
             ttr = typeRegistry.lockTypeRegistryForUpdate(5);
             List<AtlasEnumDef> enumDefs = getEnumDefStore(ttr).getAll();
             for (AtlasBaseTypeDef atlasBaseTypeDef : ttr.getAllEnumDefs()) {
                 if (atlasBaseTypeDef instanceof AtlasEnumDef) {
+                    if ("atlas_core".equalsIgnoreCase(atlasBaseTypeDef.getServiceType())) {
+                        LOG.debug("Skipping removal of built-in enum type: {}", atlasBaseTypeDef.getName());
+                        continue;
+                    }
                     ttr.removeTypeByName(atlasBaseTypeDef.getName());
                 }
             }
             ttr.addTypes(enumDefs);
             commitUpdates = true;
+        } catch (Throwable abe) {
+            LOG.warn("reloadEnumTypeDefs(): failed to reload enum defs", abe);
         } finally {
             typeRegistry.releaseTypeRegistryForUpdate(ttr, commitUpdates);
             LOG.info("<== AtlasTypeDefGraphStore.reloadEnumTypeDefs()");
@@ -155,11 +161,17 @@ public void reloadStructTypeDefs() throws AtlasBaseException {
             List<AtlasStructDef> structDefs = getStructDefStore(ttr).getAll();
             for (AtlasBaseTypeDef atlasBaseTypeDef : ttr.getAllStructDefs()) {
                 if (atlasBaseTypeDef instanceof AtlasStructDef) {
+                    if ("atlas_core".equalsIgnoreCase(atlasBaseTypeDef.getServiceType())) {
+                        LOG.debug("Skipping removal of built-in struct type: {}", atlasBaseTypeDef.getName());
+                        continue;
+                    }
                     ttr.removeTypeByName(atlasBaseTypeDef.getName());
                 }
             }
             ttr.addTypes(structDefs);
             commitUpdates = true;
+        } catch (Throwable abe) {
+            LOG.warn("reloadStructTypeDefs(): failed to reload struct defs", abe);
         } finally {
             typeRegistry.releaseTypeRegistryForUpdate(ttr, commitUpdates);
             LOG.info("<== AtlasTypeDefGraphStore.reloadStructTypeDefs()");
@@ -177,11 +189,17 @@ public void reloadEntityTypeDefs() throws AtlasBaseException {
             List<AtlasEntityDef> entityDefs = getEntityDefStore(ttr).getAll();
             for (AtlasBaseTypeDef atlasBaseTypeDef : ttr.getAllEntityDefs()) {
                 if (atlasBaseTypeDef instanceof AtlasEntityDef) {
+                    if ("atlas_core".equalsIgnoreCase(atlasBaseTypeDef.getServiceType())) {
+                        LOG.debug("Skipping removal of built-in entity type: {}", atlasBaseTypeDef.getName());
+                        continue;
+                    }
                     ttr.removeTypeByName(atlasBaseTypeDef.getName());
                 }
             }
             ttr.addTypes(entityDefs);
             commitUpdates = true;
+        } catch (Throwable abe) {
+            LOG.warn("reloadEntityTypeDefs(): failed to reload entity defs", abe);
         } finally {
             typeRegistry.releaseTypeRegistryForUpdate(ttr, commitUpdates);
             LOG.info("<== AtlasTypeDefGraphStore.reloadEntityTypeDefs()");
@@ -199,11 +217,17 @@ public void reloadRelationshipTypeDefs() throws AtlasBaseException {
             List<AtlasRelationshipDef> relationshipDefs = getRelationshipDefStore(ttr).getAll();
             for (AtlasBaseTypeDef atlasBaseTypeDef : ttr.getAllRelationshipDefs()) {
                 if (atlasBaseTypeDef instanceof AtlasRelationshipDef) {
+                    if ("atlas_core".equalsIgnoreCase(atlasBaseTypeDef.getServiceType())) {
+                        LOG.debug("Skipping removal of built-in relationship type: {}", atlasBaseTypeDef.getName());
+                        continue;
+                    }
                     ttr.removeTypeByName(atlasBaseTypeDef.getName());
                 }
             }
             ttr.addTypes(relationshipDefs);
             commitUpdates = true;
+        } catch (Throwable abe) {
+            LOG.warn("reloadRelationshipTypeDefs(): failed to reload relationship defs", abe);
         } finally {
             typeRegistry.releaseTypeRegistryForUpdate(ttr, commitUpdates);
             LOG.info("<== AtlasTypeDefGraphStore.reloadRelationshipTypeDefs()");
@@ -226,6 +250,8 @@ public void reloadBusinessMetadataTypeDefs() throws AtlasBaseException {
             }
             ttr.addTypes(businessMetadataDefs);
             commitUpdates = true;
+        } catch (Throwable abe) {
+            LOG.warn("reloadBusinessMetadataTypeDefs(): failed to reload BM defs", abe);
         } finally {
             typeRegistry.releaseTypeRegistryForUpdate(ttr, commitUpdates);
             LOG.info("<== AtlasTypeDefGraphStore.reloadBusinessMetadataTypeDefs()");
@@ -248,6 +274,8 @@ public void reloadClassificationMetadataTypeDefs() throws AtlasBaseException {
             }
             ttr.addTypes(classificationDefs);
             commitUpdates = true;
+        } catch (Throwable abe) {
+            LOG.warn("reloadClassificationMetadataTypeDefs(): failed to reload classification defs", abe);
         } finally {
             typeRegistry.releaseTypeRegistryForUpdate(ttr, commitUpdates);
             LOG.info("<== AtlasTypeDefGraphStore.reloadClassificationMetadataTypeDefs()");