diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 09609a9c1..0b07a7bcf 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -948,6 +948,11 @@ div#roadmap .wiki h1:first-child { display: none; }
 div#roadmap .wiki h1 { font-size: 120%; }
 div#roadmap .wiki h2 { font-size: 110%; }
 div#roadmap h2, div#roadmap h3 {padding-inline-end: 0;}
+div#roadmap .version-article > header {padding-block: 4px;}
+div#roadmap .version-article > header h3 {margin-block: 0;}
+div#roadmap .version-article > header .badge {inset-block-end: 0;}
+div#roadmap .version-article > header .contextual {margin-block: 0;}
+div#roadmap header:target {background-color: var(--oc-blue-0);}
 div#roadmap h3 svg {margin-inline-end: 4px;}
 body.controller-versions.action-show div#roadmap .related-issues {inline-size: 70%;}
 
diff --git a/app/views/versions/_sidebar.html.erb b/app/views/versions/_sidebar.html.erb
index 63c778a17..4b535f752 100644
--- a/app/views/versions/_sidebar.html.erb
+++ b/app/views/versions/_sidebar.html.erb
@@ -36,7 +36,7 @@
 <ul>
 <% @versions.each do |version| %>
   <li>
-    <%= link_to(format_version_name(version), "##{version_anchor(version)}") %>
+    <%= link_to(format_version_name(version), "#version-#{version.id}") %>
   </li>
 <% end %>
 </ul>
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 45b254a7d..79339e7de 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -16,12 +16,12 @@
   <div id="roadmap">
   <% @versions.each do |version| %>
   <article class="version-article <%= version.css_classes %>">
-    <% if User.current.allowed_to?(:manage_versions, version.project) %>
-      <div class="contextual">
-        <%= link_to sprite_icon('edit', l(:button_edit)), edit_version_path(version), :title => l(:button_edit), :class => 'icon-only icon-edit' %>
-      </div>
-    <% end %>
-    <header>
+    <header id="version-<%= version.id %>">
+      <% if User.current.allowed_to?(:manage_versions, version.project) %>
+        <div class="contextual">
+          <%= link_to sprite_icon('edit', l(:button_edit)), edit_version_path(version), :title => l(:button_edit), :class => 'icon-only icon-edit' %>
+        </div>
+      <% end %>
       <h3 class="icon icon-package version inline-flex">
         <%= sprite_icon 'package' %>
         <%= link_to_version version, :name => version_anchor(version) %>
diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index 405e6480b..382b555f9 100644
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_test.rb
@@ -43,7 +43,7 @@ class VersionsControllerTest < Redmine::ControllerTest
       assert_select 'input[type=hidden][name=?]', 'tracker_ids[]'
       assert_select 'input[type=checkbox][name=?]', 'tracker_ids[]', 3
       # Links to versions anchors
-      assert_select 'a[href=?]', '#2.0'
+      assert_select 'a[href=?]', '#version-3'
       # Links to completed versions in the sidebar
       assert_select 'a[href=?]', '/versions/1'
     end
@@ -89,8 +89,8 @@ class VersionsControllerTest < Redmine::ControllerTest
     assert_response :success
 
     assert_select '#sidebar' do
-      assert_select 'a[href=?]', '#2.0', :text => '2.0'
-      assert_select 'a[href=?]', '#subproject1-2.0', :text => 'eCookbook Subproject 1 - 2.0'
+      assert_select 'a[href=?]', '#version-3', :text => '2.0'
+      assert_select 'a[href=?]', '#version-4', :text => 'eCookbook Subproject 1 - 2.0'
     end
     assert_select '#content' do
       assert_select 'a[name=?]', '2.0', :text => '2.0'