diff --git a/appveyor.yml b/appveyor.yml
index ebba57d42c028e3aea822f7c5a2766c012922af0..3cb2a582e6dd344f5477b4f9ad0fcd79514c9e72 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,4 +33,4 @@ test_script:
   -VV -S ../adios2/scripts\appveyor\av_default.cmake
   -Ddashboard_full=OFF
   -Ddashboard_do_test=true
-  -DCTEST_BUILD_NAME=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%_%APPVEYOR_BUILD_NUMBER%_vs-2015
\ No newline at end of file
+  -DCTEST_BUILD_NAME=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%_%APPVEYOR_BUILD_NUMBER%_vs-2015
diff --git a/scripts/dashboard/common.cmake b/scripts/dashboard/common.cmake
index 11b691153089ee7334b704b68ddbbe9d0d24683c..9f0a997fefb70527fb6c6f904aeee580c6a932af 100644
--- a/scripts/dashboard/common.cmake
+++ b/scripts/dashboard/common.cmake
@@ -283,12 +283,6 @@ endif()
 
 #-----------------------------------------------------------------------------
 
-# Send the main script as a note.
-list(APPEND CTEST_NOTES_FILES
-  "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"
-  "${CMAKE_CURRENT_LIST_FILE}"
-  )
-
 # Check for required variables.
 foreach(req
     CTEST_CMAKE_GENERATOR
@@ -387,7 +381,14 @@ if(dashboard_do_update)
   ctest_update(RETURN_VALUE count)
   set(CTEST_CHECKOUT_COMMAND) # checkout on first iteration only
   message("Found ${count} changed files")
-  ctest_submit(PARTS Update)
+
+  # Send the main script as a note while submitting the Update part
+  set(CTEST_NOTES_FILES
+    "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"
+    "${CMAKE_CURRENT_LIST_FILE}"
+  )
+
+  ctest_submit(PARTS Update Notes)
 endif()
 
 if(dashboard_do_configure)
@@ -396,7 +397,8 @@ if(dashboard_do_configure)
   endif()
   message("Calling ctest_configure")
   ctest_configure(${dashboard_configure_args})
-  ctest_submit(PARTS Configure)
+  set(CTEST_NOTES_FILES "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt")
+  ctest_submit(PARTS Configure Notes)
 endif()
 
 ctest_read_custom_files(${CTEST_BINARY_DIRECTORY})