diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriver.inc.dsc b/CryptoBinPkg/Driver/Bin/CryptoDriver.inc.dsc
index 0c7bc181..ece94f9f 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriver.inc.dsc
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriver.inc.dsc
@@ -2,12 +2,12 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriver.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.464561
+# GENERATED ON: 2024-02-26 15:25:45.485204
 
 # this is to be included by a platform :)
 [Defines]
 !ifndef PEI_CRYPTO_SERVICES
- !error Please define PEI_CRYPTO_SERVICES
+  DEFINE PEI_CRYPTO_SERVICES = NONE
 !endif
 !if $(PEI_CRYPTO_SERVICES) IN "ALL NONE TINY_SHA MINIMAL_SHA_SM3 SMALL_SHA_RSA STANDARD"
   !if $(PEI_CRYPTO_SERVICES) != NONE
@@ -15,14 +15,14 @@
       !error Please define PEI_CRYPTO_ARCH for your platform
     !endif
   !else
-     # we don't have a problem
+    DEFINE PEI_CRYPTO_ARCH = NONE
   !endif
 !else
   !error PEI_CRYPTO_SERVICES must be set to one of ALL NONE TINY_SHA MINIMAL_SHA_SM3 SMALL_SHA_RSA STANDARD.
 !endif
 
 !ifndef DXE_CRYPTO_SERVICES
- !error Please define DXE_CRYPTO_SERVICES
+  DEFINE DXE_CRYPTO_SERVICES = NONE
 !endif
 !if $(DXE_CRYPTO_SERVICES) IN "ALL NONE TINY_SHA MINIMAL_SHA_SM3 SMALL_SHA_RSA STANDARD"
   !if $(DXE_CRYPTO_SERVICES) != NONE
@@ -30,14 +30,14 @@
       !error Please define DXE_CRYPTO_ARCH for your platform
     !endif
   !else
-     # we don't have a problem
+    DEFINE DXE_CRYPTO_ARCH = NONE
   !endif
 !else
   !error DXE_CRYPTO_SERVICES must be set to one of ALL NONE TINY_SHA MINIMAL_SHA_SM3 SMALL_SHA_RSA STANDARD.
 !endif
 
 !ifndef RUNTIMEDXE_CRYPTO_SERVICES
- !error Please define RUNTIMEDXE_CRYPTO_SERVICES
+  DEFINE RUNTIMEDXE_CRYPTO_SERVICES = NONE
 !endif
 !if $(RUNTIMEDXE_CRYPTO_SERVICES) IN "ALL NONE TINY_SHA MINIMAL_SHA_SM3 SMALL_SHA_RSA STANDARD"
   !if $(RUNTIMEDXE_CRYPTO_SERVICES) != NONE
@@ -45,14 +45,14 @@
       !error Please define RUNTIMEDXE_CRYPTO_ARCH for your platform
     !endif
   !else
-     # we don't have a problem
+    DEFINE RUNTIMEDXE_CRYPTO_ARCH = NONE
   !endif
 !else
   !error RUNTIMEDXE_CRYPTO_SERVICES must be set to one of ALL NONE TINY_SHA MINIMAL_SHA_SM3 SMALL_SHA_RSA STANDARD.
 !endif
 
 !ifndef SMM_CRYPTO_SERVICES
- !error Please define SMM_CRYPTO_SERVICES
+  DEFINE SMM_CRYPTO_SERVICES = NONE
 !endif
 !if $(SMM_CRYPTO_SERVICES) IN "ALL NONE TINY_SHA MINIMAL_SHA_SM3 SMALL_SHA_RSA STANDARD"
   !if $(SMM_CRYPTO_SERVICES) != NONE
@@ -60,14 +60,14 @@
       !error Please define SMM_CRYPTO_ARCH for your platform
     !endif
   !else
-     # we don't have a problem
+    DEFINE SMM_CRYPTO_ARCH = NONE
   !endif
 !else
   !error SMM_CRYPTO_SERVICES must be set to one of ALL NONE TINY_SHA MINIMAL_SHA_SM3 SMALL_SHA_RSA STANDARD.
 !endif
 
 !ifndef STANDALONEMM_CRYPTO_SERVICES
- !error Please define STANDALONEMM_CRYPTO_SERVICES
+  DEFINE STANDALONEMM_CRYPTO_SERVICES = NONE
 !endif
 !if $(STANDALONEMM_CRYPTO_SERVICES) IN "ALL NONE TINY_SHA MINIMAL_SHA_SM3 SMALL_SHA_RSA STANDARD"
   !if $(STANDALONEMM_CRYPTO_SERVICES) != NONE
@@ -75,7 +75,7 @@
       !error Please define STANDALONEMM_CRYPTO_ARCH for your platform
     !endif
   !else
-     # we don't have a problem
+    DEFINE STANDALONEMM_CRYPTO_ARCH = NONE
   !endif
 !else
   !error STANDALONEMM_CRYPTO_SERVICES must be set to one of ALL NONE TINY_SHA MINIMAL_SHA_SM3 SMALL_SHA_RSA STANDARD.
diff --git a/CryptoBinPkg/Driver/Packaging/generate_cryptodriver.py b/CryptoBinPkg/Driver/Packaging/generate_cryptodriver.py
index e539b4c9..da7c1ca1 100644
--- a/CryptoBinPkg/Driver/Packaging/generate_cryptodriver.py
+++ b/CryptoBinPkg/Driver/Packaging/generate_cryptodriver.py
@@ -787,7 +787,7 @@ class options():
     for phase in phases:
         phase = phase.upper()
         dsc_lines.append(f"!ifndef {phase}_CRYPTO_SERVICES")
-        dsc_lines.append(f" !error Please define {phase}_CRYPTO_SERVICES")
+        dsc_lines.append(f"  DEFINE {phase}_CRYPTO_SERVICES = NONE")
         dsc_lines.append("!endif")
         dsc_lines.append(
             f"!if $({phase}_CRYPTO_SERVICES) IN \"{all_flavors}\"")
@@ -797,7 +797,7 @@ class options():
             f"      !error Please define {phase}_CRYPTO_ARCH for your platform")
         dsc_lines.append("    !endif")
         dsc_lines.append("  !else")
-        dsc_lines.append("     # we don't have a problem")
+        dsc_lines.append(f"    DEFINE {phase}_CRYPTO_ARCH = NONE")
         dsc_lines.append("  !endif")
         dsc_lines.append("!else")
         dsc_lines.append(