diff --git a/docs/_includes/posts.html b/docs/_includes/posts.html
index 1cfb92ad..bdadbf77 100644
--- a/docs/_includes/posts.html
+++ b/docs/_includes/posts.html
@@ -2,7 +2,7 @@
   {% if site.posts.size == 0 %}
     <h2>No job post found</h2>
   {% else %}
-    {% assign related = site.posts | sort: "commit_at" | reverse | where:"lang", page.lang %}
+    {% assign related = site.posts | sort: "date" | reverse | where:"lang", page.lang %}
     {% if related.size > 0 %}
       {% for post in related %}
         <a href="{{ post.permalink }}" class="list-item container">
diff --git a/docs/_layouts/post.html b/docs/_layouts/post.html
index 462aac78..e735c3e8 100644
--- a/docs/_layouts/post.html
+++ b/docs/_layouts/post.html
@@ -12,9 +12,9 @@ <h1 class="post-title" data-aos="fade-up" data-aos-delay="200" data-aos-offset="
 	{{ site.data.translations.postUpdatedBy[page.lang] }}:
 	<time>
      	  {% if page.lang == 'en' %}
-	    {{ page.commit_at | date_to_string }}
+	    {{ page.date | date_to_string }}
 	  {% else %}
-	    {{ page.commit_at | date: "%Y-%m-%d " }}
+	    {{ page.date | date: "%Y-%m-%d " }}
 	  {% endif %}
 	</time>
       </small>
diff --git a/docs/upsert_data_by_readme.rb b/docs/upsert_data_by_readme.rb
index b01facc9..c0ae4124 100755
--- a/docs/upsert_data_by_readme.rb
+++ b/docs/upsert_data_by_readme.rb
@@ -77,12 +77,12 @@
     layout: post
     lang: #{lang}
     permalink: /#{lang}/#{id}
-    title: #{name}
+    commit_url: #{latest_commit_url}
+    date:       #{latest_commit_at}
+    link:       #{link}
+    title:      #{name}
     description: '#{Sanitize.clean(CGI.unescapeHTML description).strip}'
     categories: #{is_full_remote}
-    link: #{link}
-    commit_url: #{latest_commit_url}
-    commit_at:  #{latest_commit_at}
     redirect_from:
       - /#{lang}/#{id_v1}
     ---