diff --git a/core/src/main/java/hudson/slaves/Cloud.java b/core/src/main/java/hudson/slaves/Cloud.java
index 380db7782fe7..4bf79115d36d 100644
--- a/core/src/main/java/hudson/slaves/Cloud.java
+++ b/core/src/main/java/hudson/slaves/Cloud.java
@@ -311,10 +311,10 @@ public HttpResponse doDoDelete() throws IOException {
     }
 
     /**
-     * Accepts the update to the node configuration.
+     * Accepts the update to the node name.
      */
     @POST
-    public HttpResponse doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+    public HttpResponse doRename(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
         checkPermission(Jenkins.ADMINISTER);
 
         Jenkins j = Jenkins.get();
@@ -330,8 +330,49 @@ public HttpResponse doConfigSubmit(StaplerRequest req, StaplerResponse rsp) thro
         }
         j.clouds.replace(this, result);
         j.save();
-        // take the user back to the root clouds page.
-        return FormApply.success("..");
+
+        String reqPath = req.getOriginalRequestURI();
+        String[] uriTokens = reqPath.replaceFirst("^/", "").split("/");
+        if (uriTokens.length < 3 || !"rename".equals(uriTokens[uriTokens.length - 1])) {
+            // We should never be here, expecting URI format jenkins/cloud/name/configSubmit
+            throw new ServletException("Expected cloud rename URI: " + reqPath);
+        }
+        String cloudId = uriTokens[uriTokens.length - 2];
+        if (this.name.equals(cloudId)) {
+            // cloud name being used in URI
+            if (!proposedName.equals(this.name)) {
+                // name changed
+                cloudId = proposedName;
+            } else {
+                cloudId = this.name;
+            }
+        }
+
+        // take the user to the renamed cloud top page.
+        return FormApply.success("../" + cloudId);
+    }
+
+    /**
+     * Accepts the update to the node configuration. Node name is not allowed to be changed.
+     */
+    @POST
+    public HttpResponse doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+        checkPermission(Jenkins.ADMINISTER);
+
+        Jenkins j = Jenkins.get();
+        Cloud cloud = j.getCloud(this.name);
+        if (cloud == null) {
+            throw new ServletException("No such cloud " + this.name);
+        }
+        Cloud result = cloud.reconfigure(req, req.getSubmittedForm());
+        String proposedName = result.name;
+        if (!proposedName.equals(this.name)) {
+            throw new Descriptor.FormException(jenkins.agents.Messages.CloudSet_DoNotRename(), "name");
+        }
+        j.clouds.replace(this, result);
+        j.save();
+        // take the user back to the cloud top page.
+        return FormApply.success(".");
     }
 
     public Cloud reconfigure(@NonNull final StaplerRequest req, JSONObject form) throws Descriptor.FormException {
diff --git a/core/src/main/resources/hudson/slaves/Cloud/rename.jelly b/core/src/main/resources/hudson/slaves/Cloud/rename.jelly
new file mode 100644
index 000000000000..61cfa1e5c17d
--- /dev/null
+++ b/core/src/main/resources/hudson/slaves/Cloud/rename.jelly
@@ -0,0 +1,46 @@
+<!--
+The MIT License
+
+Copyright (c) 2023, CloudBees Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+  <l:layout permission="${app.ADMINISTER}" title="${%title(it.name)}">
+    <st:include page="sidepanel.jelly"/>
+    <l:breadcrumb title="${%Rename Cloud}"/>
+    <l:main-panel>
+      <f:form method="post" action="rename" name="config" class="jenkins-form">
+        <j:set var="instance" value="${it}"/>
+        <j:set var="descriptor" value="${instance.descriptor}"/>
+
+        <f:entry title="${%Name}" field="name">
+            <f:textbox />
+        </f:entry>
+
+        <f:bottomButtonBar>
+          <f:submit value="${%Save}"/>
+        </f:bottomButtonBar>
+      </f:form>
+      <st:adjunct includes="lib.form.confirm"/>
+    </l:main-panel>
+  </l:layout>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/slaves/Cloud/sidepanel.jelly b/core/src/main/resources/hudson/slaves/Cloud/sidepanel.jelly
index 551560f93d3e..8d1b15852ec5 100644
--- a/core/src/main/resources/hudson/slaves/Cloud/sidepanel.jelly
+++ b/core/src/main/resources/hudson/slaves/Cloud/sidepanel.jelly
@@ -30,6 +30,9 @@ THE SOFTWARE.
             <l:task contextMenu="false" href="." icon="symbol-computer" title="${%Status}"/>
             <l:task href="configure" icon="symbol-settings"
                     title="${app.hasPermission(app.ADMINISTER) ? '%Configure' : '%View Configuration'}"/>
+            <l:task href="rename" icon="symbol-changes"
+                    permission="${app.ADMINISTER}"
+                    title="${%Rename}"/>
             <l:delete permission="${app.ADMINISTER}" title="${%Delete Cloud}" message="${%delete.cloud(it.displayName)}"/>
             <t:actions />
         </l:tasks>
diff --git a/core/src/main/resources/jenkins/agents/Messages.properties b/core/src/main/resources/jenkins/agents/Messages.properties
index 11a27f40642c..348c3be06860 100644
--- a/core/src/main/resources/jenkins/agents/Messages.properties
+++ b/core/src/main/resources/jenkins/agents/Messages.properties
@@ -1,6 +1,7 @@
 CloudSet.DisplayName=Clouds
 CloudSet.CloudAlreadyExists=Cloud called ‘{0}’ already exists
 CloudSet.SpecifyCloudToCopy=Specify which cloud to copy
+CloudSet.DoNotRename=Rename cloud using the "Rename" page
 CloudSet.NoSuchCloud=No such cloud: {0}
 CloudsLink.DisplayName=Clouds
 CloudsLink.Description=Add, remove, and configure cloud instances to provision agents on-demand.