diff --git a/libopenfpga/libfpgabitstream/src/report_arch_bitstream_distribution.cpp b/libopenfpga/libfpgabitstream/src/report_arch_bitstream_distribution.cpp
index 4446d1aac..b6bf66d96 100644
--- a/libopenfpga/libfpgabitstream/src/report_arch_bitstream_distribution.cpp
+++ b/libopenfpga/libfpgabitstream/src/report_arch_bitstream_distribution.cpp
@@ -33,11 +33,12 @@ void report_architecture_bitstream_distribution_xml_file_head(std::fstream& fp,
  
   fp << "<!-- " << std::endl;
   fp << "\t- Report Architecture Bitstream Distribution" << std::endl;
-  fp << "\t- Version: " << openfpga::VERSION << std::endl;
 
   if (include_time_stamp) {
     auto end = std::chrono::system_clock::now(); 
     std::time_t end_time = std::chrono::system_clock::to_time_t(end);
+    /* Note that version is also a type of time stamp */
+    fp << "\t- Version: " << openfpga::VERSION << std::endl;
     fp << "\t- Date: " << std::ctime(&end_time) ;
   }
 
diff --git a/openfpga/src/fpga_bitstream/write_text_fabric_bitstream.cpp b/openfpga/src/fpga_bitstream/write_text_fabric_bitstream.cpp
index 236013878..44b650c90 100644
--- a/openfpga/src/fpga_bitstream/write_text_fabric_bitstream.cpp
+++ b/openfpga/src/fpga_bitstream/write_text_fabric_bitstream.cpp
@@ -35,11 +35,12 @@ void write_fabric_bitstream_text_file_head(std::fstream& fp,
   valid_file_stream(fp);
  
   fp << "// Fabric bitstream" << std::endl;
-  fp << "// Version: " << openfpga::VERSION << std::endl;
 
   if (include_time_stamp) {
     auto end = std::chrono::system_clock::now(); 
     std::time_t end_time = std::chrono::system_clock::to_time_t(end);
+    /* Note that version is also a type of time stamp */
+    fp << "// Version: " << openfpga::VERSION << std::endl;
     fp << "// Date: " << std::ctime(&end_time);
   }
 }
diff --git a/openfpga/src/fpga_bitstream/write_xml_io_mapping.cpp b/openfpga/src/fpga_bitstream/write_xml_io_mapping.cpp
index 9f8ed3fa8..1428a6c8d 100644
--- a/openfpga/src/fpga_bitstream/write_xml_io_mapping.cpp
+++ b/openfpga/src/fpga_bitstream/write_xml_io_mapping.cpp
@@ -35,11 +35,12 @@ void write_io_mapping_xml_file_head(std::fstream& fp,
  
   fp << "<!--" << std::endl;
   fp << "\t- I/O mapping" << std::endl;
-  fp << "\t- Version: " << openfpga::VERSION << std::endl;
 
   if (include_time_stamp) {
     auto end = std::chrono::system_clock::now(); 
     std::time_t end_time = std::chrono::system_clock::to_time_t(end);
+    /* Note that version is also a type of time stamp */
+    fp << "\t- Version: " << openfpga::VERSION << std::endl;
     fp << "\t- Date: " << std::ctime(&end_time) ;
   }
 
diff --git a/openfpga_flow/regression_test_scripts/basic_reg_test.sh b/openfpga_flow/regression_test_scripts/basic_reg_test.sh
index 16bc4cda1..9708fdaba 100755
--- a/openfpga_flow/regression_test_scripts/basic_reg_test.sh
+++ b/openfpga_flow/regression_test_scripts/basic_reg_test.sh
@@ -148,7 +148,7 @@ run-task basic_tests/explicit_multi_verilog_files --debug --show_thread_logs
 echo -e "Testing output files without time stamp";
 run-task basic_tests/no_time_stamp --debug --show_thread_logs
 # Run git-diff to ensure no changes on the golden netlists
-if git diff origin/main HEAD --name-status -- ':openfpga_flow/tasks/basic_tests/no_time_stamp/golden_output_no_time_stamp/**'; then
+if git diff --name-status -- ':openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/**'; then
   echo -e "Golden netlist remain unchanged"
 else
   echo -e "Detect changes in golden scripts"; exit 1;
diff --git a/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/bitstream_distribution.xml b/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/bitstream_distribution.xml
index 9b1bad1ca..b734007e7 100644
--- a/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/bitstream_distribution.xml
+++ b/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/bitstream_distribution.xml
@@ -1,6 +1,5 @@
 <!-- 
 	- Report Architecture Bitstream Distribution
-	- Version: 1.0.3764-dev+dd400579-dirty
 --> 
 
 <block name="fpga_top" number_of_bits="527">
diff --git a/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/fabric_bitstream.bit b/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/fabric_bitstream.bit
index f7279bb7a..6bdd75fcb 100644
--- a/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/fabric_bitstream.bit
+++ b/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/fabric_bitstream.bit
@@ -1,5 +1,4 @@
 // Fabric bitstream
-// Version: 1.0.3764-dev+dd400579-dirty
 // Bitstream length: 527
 // Bitstream width (LSB -> MSB): 1
 1
diff --git a/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/pin_mapping.xml b/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/pin_mapping.xml
index 191a22ef8..934c68508 100644
--- a/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/pin_mapping.xml
+++ b/openfpga_flow/tasks/basic_tests/no_time_stamp/golden_outputs_no_time_stamp/pin_mapping.xml
@@ -1,6 +1,5 @@
 <!--
 	- I/O mapping
-	- Version: 1.0.3764-dev+dd400579-dirty
 -->
 
 <io_mapping>