diff --git a/Makefile b/Makefile
index a01e57e..9cfb2f3 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,8 @@ CORIM_IMPORT := $(addprefix $(IMPORTS_DIR), corim-import.cddl )
 
 check:: check-comidx check-comidx-examples
 check:: check-spdm check-spdm-examples
-check:: check-ce check-ce-examples exp-ce
+check:: check-ce check-ce-examples
+check:: exp-ce
 
 include $(CE_DIR)ce-frags.mk
 CE_DEPS := $(addprefix $(CE_DIR), $(CE_FRAGS))
@@ -41,7 +42,6 @@ EV_FRAGS += $(CORIM_IMPORT)
 EV_EXAMPLES := $(wildcard examples/ce-*.diag) # concise-evidence example filenames have 'ce-' prefix
 
 $(eval $(call cddl_check_template,ce,$(EV_FRAGS),$(EV_EXAMPLES)))
-$(eval $(call cddl_exp_template,ce,$(CE_DEPS)))
 
 COMID_X_FRAGS := comid-x-start.cddl
 COMID_X_FRAGS += $(CE_DEPS)
@@ -51,6 +51,9 @@ COMID_X_EXAMPLES := $(wildcard examples/comid-*.diag) # concise-mid-tag example
 
 $(eval $(call cddl_check_template,comidx,$(COMID_X_FRAGS),$(COMID_X_EXAMPLES)))
 
+# Make ce.cddl export file
+$(eval $(call cddl_exp_template,ce,$(CE_DEPS)))
+
 clean: ; rm -f $(CLEANFILES)
 
 clean-extra: clean ; $(MAKE) -C $(CORIM_DIR) clean