diff --git a/boards/omnigul/omnigul.config b/boards/omnigul/omnigul.config
index 19a0fe8b0..dcb3b2ca9 100644
--- a/boards/omnigul/omnigul.config
+++ b/boards/omnigul/omnigul.config
@@ -11,11 +11,15 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-omnigul.config
 CONFIG_LINUX_CONFIG=config/linux-omnigul.config
 
 #Enable DEBUG output
-#export CONFIG_DEBUG_OUTPUT=y
-#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
+export CONFIG_DEBUG_OUTPUT=y
+export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
 #Enable TPM2 pcap output under /tmp
 #export CONFIG_TPM2_CAPTURE_PCAP=y
 
+# Since the TPM 2.0 implementation in the CR50 is not complete
+# we are disabling TPM Disk Unlock
+CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
+
 #On-demand hardware support (modules.cpio)
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000=n