diff --git a/src/main/content/_assets/js/guides.js b/src/main/content/_assets/js/guides.js
index 672f815dc7..a9c853e802 100644
--- a/src/main/content/_assets/js/guides.js
+++ b/src/main/content/_assets/js/guides.js
@@ -518,7 +518,7 @@ $(document).ready(function () {
             }
             if (tag.visible == "true") {
               //add "RUN IN CLOUD" orange pill to applicable guides if the guide is not deprecated
-              if (tag_name.toLowerCase() == "run in cloud" && !dep) {
+              if (tag_name.toLowerCase() == "run-in-cloud" && !dep) {
                 //add to last child element in .guide_item element
                 if ($(this).children().last().hasClass("new_guide_container")) {
                   //add before "NEW" orange pill so "NEW" pill shows first because float: right; reverses element order
diff --git a/src/main/content/_i18n/en.yml b/src/main/content/_i18n/en.yml
index 79cd0cf092..2ca24094af 100644
--- a/src/main/content/_i18n/en.yml
+++ b/src/main/content/_i18n/en.yml
@@ -213,7 +213,7 @@ guides:
   suggested_tags: Suggested tags
   new: new
   new_camel_case: New
-  run_in_cloud: run in cloud
+  run-in-cloud: run in cloud
   interactive: interactive
   interactive_camel_case: Interactive
   toggle_navigation: Toggle navigation
@@ -252,26 +252,26 @@ blog:
     part3: feed.
   tags:
     announcements: announcements
-    MicroProfile: MicroProfile
-    Java_EE: Java EE
-    Java_SE: Java SE
+    microprofile: MicroProfile
+    java-ee: Java EE
+    java-se: Java SE
     release: release
     beta: beta
-    Maven: Maven
+    maven: Maven
     security: security
-    Spring: Spring
-    Docker: Docker
-    Gradle: Gradle
+    spring: Spring
+    docker: Docker
+    gradle: Gradle
     metrics: metrics
-    Jakarta_EE: Jakarta EE
-    Kubernetes: Kubernetes
+    jakarta-ee: Jakarta EE
+    kubernetes: Kubernetes
     community: community
     test: test
-    developer_experience: developer experience
-    OpenShift: OpenShift
+    developer-experience: developer experience
+    openshift: OpenShift
     monitoring: monitoring
-    performance_enhancements: performance enhancements
-    data_sources: data sources
+    performance-enhancements: performance enhancements
+    data-sources: data sources
     reactive: reactive
     devops: devops
 overview:
diff --git a/src/main/content/_i18n/ja.yml b/src/main/content/_i18n/ja.yml
index de421cd6fc..a1bce1fa67 100644
--- a/src/main/content/_i18n/ja.yml
+++ b/src/main/content/_i18n/ja.yml
@@ -213,7 +213,7 @@ guides:
   suggested_tags: Suggested tags
   new: new
   new_camel_case: New
-  run_in_cloud: run in cloud
+  run-in-cloud: run in cloud
   interactive: interactive
   interactive_camel_case: Interactive
   toggle_navigation: Toggle navigation
@@ -252,26 +252,26 @@ blog:
     part3: フィードを購読します。
   tags:
     announcements: 発表
-    MicroProfile: MicroProfile
-    Java_EE: Java EE
-    Java_SE: Java SE
+    microprofile: MicroProfile
+    java-ee: Java EE
+    java-se: Java SE
     release: リリース
     beta: ベータ
-    Maven: Maven
+    maven: Maven
     security: セキュリティ
-    Spring: Spring
-    Docker: Docker
-    Gradle: Gradle
+    spring: Spring
+    docker: Docker
+    gradle: Gradle
     metrics: メトリック
-    Jakarta_EE: Jakarta EE
-    Kubernetes: Kubernetes
+    jakarta-ee: Jakarta EE
+    kubernetes: Kubernetes
     community: コミュニティ
     test: テスト
-    developer_experience: 開発者経験
-    OpenShift: OpenShift
+    developer-experience: 開発者経験
+    openshift: OpenShift
     monitoring: モニタリング
-    performance_enhancements: パフォーマンスの向上
-    data_sources: データ・ソース
+    performance-enhancements: パフォーマンスの向上
+    data-sources: データ・ソース
     reactive: 反応性
     devops: DevOps
 overview:
diff --git a/src/main/content/_i18n/zh-Hans.yml b/src/main/content/_i18n/zh-Hans.yml
index 3b3be6f644..479f0f53f0 100644
--- a/src/main/content/_i18n/zh-Hans.yml
+++ b/src/main/content/_i18n/zh-Hans.yml
@@ -213,7 +213,7 @@ guides:
   suggested_tags: Suggested tags
   new: new
   new_camel_case: New
-  run_in_cloud: run in cloud
+  run-in-cloud: run in cloud
   interactive: interactive
   interactive_camel_case: Interactive
   toggle_navigation: Toggle navigation
@@ -251,26 +251,26 @@ blog:
     part3: 订阅源。
   tags:
     announcements: 公告
-    MicroProfile: MicroProfile
-    Java_EE: Java EE
-    Java_SE: Java SE
+    microprofile: MicroProfile
+    java-ee: Java EE
+    java-se: Java SE
     release: 释放
     beta: 测试版
-    Maven: Maven
+    maven: Maven
     security: 网络安全
-    Spring: Spring
-    Docker: Docker
-    Gradle: Gradle
+    spring: Spring
+    docker: Docker
+    gradle: Gradle
     metrics: 度量
-    Jakarta_EE: Jakarta EE
-    Kubernetes: Kubernetes
+    jakarta-ee: Jakarta EE
+    kubernetes: Kubernetes
     community: 社区
     test: 测试
-    developer_experience: 开发者体验
-    OpenShift: OpenShift
+    developer-experience: 开发者体验
+    openshift: OpenShift
     monitoring: 监测
-    performance_enhancements: 性能增强
-    data_sources: 数据源
+    performance-enhancements: 性能增强
+    data-sources: 数据源
     reactive: 反应
     devops: DevOps
 overview:
diff --git a/src/main/content/blog.html b/src/main/content/blog.html
index 9052a1191c..50caed25d0 100644
--- a/src/main/content/blog.html
+++ b/src/main/content/blog.html
@@ -57,20 +57,20 @@ <h2 class="blog_subtitle">
      {% t blog.featured_tags %}
     </h2>
     <div id="featured_tags_list" role="list">
-     <p class="featured_tag" data-tag-id="announcements" role="button" tabindex="0">
+     <p class="featured_tag" data-tag-id="announcements" role="listitem" tabindex="0">
       {% t blog.tags.announcements %}
      </p>
      <span>
       ,
      </span>
-     <p class="featured_tag" data-tag-id="MicroProfile" role="button" tabindex="0">
-      {% t blog.tags.MicroProfile %}
+     <p class="featured_tag" data-tag-id="microprofile" role="listitem" tabindex="0">
+      {% t blog.tags.microprofile %}
      </p>
      <span>
       ,
      </span>
-     <p class="featured_tag" data-tag-id="Jakarta_EE" role="button" tabindex="0">
-      {% t blog.tags.Jakarta_EE %}
+     <p class="featured_tag" data-tag-id="jakarta-ee" role="listitem" tabindex="0">
+      {% t blog.tags.jakarta-ee %}
      </p>
      <span>
       ,
@@ -103,7 +103,7 @@ <h2 class="blog_subtitle">
    </div>
    <div class="col-md-12 col-lg-8 offset-lg-4" id="right_column">
     <div id="filter">
-     <img alt="Remove tag filter" role="button" id="x_button" onclick="blog.removeFilter(true);" onkeypress="blog.removeFilter(true);" src="/img/blog_x_button.svg" tabindex="0"/>
+     <img alt="Remove tag filter" id="x_button" onclick="blog.removeFilter(true);" onkeypress="blog.removeFilter(true);" role="button" src="/img/blog_x_button.svg" tabindex="0"/>
      <span id="no_results_message">
       {% t blog.no_results_found %} {% t blog.see %}
       <a class="orange_link_light_background" href="{{baseURL}}/blog/">
@@ -383,4 +383,4 @@ <h2 class="blog_post_title_condensed">
  <div id="ufo_images_mobile_container">
   <img alt="ufo and clouds" class="d-block d-md-none img-fluid" id="ufo_images_mobile" src="/img/blog_images_mobile.svg"/>
  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/main/content/guides.html b/src/main/content/guides.html
index e2affba2c7..9041204d5b 100644
--- a/src/main/content/guides.html
+++ b/src/main/content/guides.html
@@ -69,7 +69,7 @@ <h2 id="guides_title">{% t pages.guides %}</h2>
         <button type="button" class="tag_button">{% t guides.new %}</button>
         <button type="button" class="tag_button">microprofile</button>
         <button type="button" class="tag_button">jakarta ee</button>
-        <button type="button" class="tag_button">{% t guides.run_in_cloud %}</button>
+        <button type="button" class="tag_button">{% t guides.run-in-cloud %}</button>
         <button type="button" class="tag_button">{% t guides.interactive %}</button>
       </div>
     </div>