diff --git a/pom.xml b/pom.xml
index 13e47789..f49501ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.504</jenkins.baseline>
+    <jenkins.baseline>2.516</jenkins.baseline>
     <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <no-test-jar>false</no-test-jar>
     <hpi.compatibleSinceVersion>5.2</hpi.compatibleSinceVersion>
@@ -60,7 +60,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>5015.vb_52d36583443</version>
+        <version>5174.v568097ea_b_9e2</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly b/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly
index 4837bf60..577899a9 100644
--- a/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly
+++ b/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly
@@ -34,11 +34,13 @@ THE SOFTWARE.
 
     <l:side-panel sticky="true">
       <l:app-bar title="${%Configuration}"/>
-      <div id="tasks" />
+      <div id="tasks">
+        <l:skeleton type="side-panel" />
+      </div>
     </l:side-panel>
 
     <l:main-panel>
-      <div class="behavior-loading">${%LOADING}</div>
+      <l:skeleton />
       <f:form method="post" class="jenkins-form" action="configSubmit" name="config" tableClass="config-table">
         <j:set var="descriptor" value="${it.descriptor}" />
         <j:set var="instance" value="${it}" />