diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 000000000..28c205d3c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,52 @@
+---
+name: Bug report
+about: Users can use this template to report bugs and provide required information
+  to enable investigation
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+Hi there! Thank you for discovering and submitting an issue!
+
+A potentially helpful troubleshooting guide may be found at our [Common issues and resolutions](https://learn.microsoft.com/en-us/azure/iot-hub-device-update/troubleshoot-device-update) page.
+Note: please use your Azure subscription if you need to share any information from your Azure subscription such as connection strings, service names (IoTHub, Provisioning), etc.
+
+Need Support?
+* Have a feature request? Please post it on [Ideas](https://github.com/Azure/iot-hub-device-update/discussions/categories/ideas) to help us prioritize.
+* Have a technical question? Ask on [Q & A](https://github.com/Azure/iot-hub-device-update/discussions/categories/q-a) 
+* Need support? Azure customers with support plans have access to priority technical support directly from the Azure Portal. Support plan details are at: https://azure.microsoft.com/en-us/support/plans/
+
+Provide a general summary of the issue in the Title above
+-->
+## Expected Behavior
+Tell us what should happen
+
+## Current Behavior
+Tell us what happens instead of the expected behavior
+
+## Steps to Reproduce
+Provide a detailed set of steps to reproduce the bug.
+1.
+2.
+3.
+4.
+
+### Device Information
+* Host OS [e.g. Ubuntu 18.04, Windows Server IoT 2019]: 
+* Architecture [e.g. amd64, arm32, arm64]: 
+* Provisioning Method:
+*DU Agent Version (run 'sudo -u adu /usr/bin/AducIotAgent -v'):
+
+## Logs
+<!--
+Please share as many logs as possible. This will help debugging
+Follow [Create a log collection operation](https://learn.microsoft.com/en-us/azure/iot-hub-device-update/device-update-log-collection?tabs=portal) to help extract useful information.
+Don't forget to remove any connection string information!
+-->
+
+
+## Additional Information
+Please provide any additional information that may be helpful in understanding the issue.
diff --git a/src/utils/d2c_messaging/inc/aduc/d2c_messaging.h b/src/utils/d2c_messaging/inc/aduc/d2c_messaging.h
index df7c27dad..5e35cb81a 100644
--- a/src/utils/d2c_messaging/inc/aduc/d2c_messaging.h
+++ b/src/utils/d2c_messaging/inc/aduc/d2c_messaging.h
@@ -21,11 +21,11 @@ EXTERN_C_BEGIN
 typedef enum _tagADUC_D2C_Message_Type
 {
     ADUC_D2C_Message_Type_Device_Update_Result = 0, /**< deviceUpdate interface reported property */
-    ADUC_D2C_Message_Type_Device_Update_ACK, /**< deviceUpdate interface ACK */
-    ADUC_D2C_Message_Type_Device_Information, /**< deviceInformation interface reported property */
-    ADUC_D2C_Message_Type_Diagnostics, /**< diagnostics interface reported property */
-    ADUC_D2C_Message_Type_Diagnostics_ACK, /**< diagnostics interface ACK */
-    ADUC_D2C_Message_Type_Device_Properties, /**< deviceUpdate interface reported property */
+    ADUC_D2C_Message_Type_Device_Update_ACK,        /**< deviceUpdate interface ACK */
+    ADUC_D2C_Message_Type_Device_Information,       /**< deviceInformation interface reported property */
+    ADUC_D2C_Message_Type_Diagnostics,              /**< diagnostics interface reported property */
+    ADUC_D2C_Message_Type_Diagnostics_ACK,          /**< diagnostics interface ACK */
+    ADUC_D2C_Message_Type_Device_Properties,        /**< deviceUpdate interface reported property */
     ADUC_D2C_Message_Type_Max
 } ADUC_D2C_Message_Type;