diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
new file mode 100644
index 0000000..30f001f
--- /dev/null
+++ b/.github/dependabot.yaml
@@ -0,0 +1,13 @@
+name: cd
+on:
+  workflow_dispatch:
+  check_run:
+    types:
+      - completed
+
+jobs:
+  maven-cd:
+    uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
+    secrets:
+      MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+      MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
\ No newline at end of file
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index fa7787e..0d0b1c9 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,3 +1 @@
 _extends: .github
-tag-template: node-iterator-api-$NEXT_MINOR_VERSION
-name-template: Node Iterator API Plugin $NEXT_MINOR_VERSION
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
new file mode 100644
index 0000000..0279984
--- /dev/null
+++ b/.github/workflows/cd.yaml
@@ -0,0 +1,15 @@
+# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins
+
+name: cd
+on:
+  workflow_dispatch:
+  check_run:
+    types:
+      - completed
+
+jobs:
+  maven-cd:
+    uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
+    secrets:
+      MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+      MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
deleted file mode 100644
index 7461cd0..0000000
--- a/.github/workflows/release-drafter.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Automates creation of Release Drafts using Release Drafter
-# More Info: https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  update_release_draft:
-    runs-on: ubuntu-latest
-    steps:
-      # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 0000000..9ac2968
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.4</version>
+  </extension>
+</extensions>
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 0000000..f7daf60
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,3 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals
+-Dchangelist.format=%d.v%s
diff --git a/pom.xml b/pom.xml
index c9a5f72..1313603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,16 +29,12 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>3.50</version>
+    <version>4.46</version>
+    <relativePath/>
   </parent>
 
-  <properties>
-    <jenkins.version>2.60.3</jenkins.version>
-    <java.level>8</java.level>
-  </properties>
-
   <artifactId>node-iterator-api</artifactId>
-  <version>1.5.2-SNAPSHOT</version>
+  <version>${changelist}</version>
   <packaging>hpi</packaging>
 
   <name>Node Iterator API Plugin</name>
@@ -48,6 +44,14 @@
     plugin can be used by cloud provider plugins to identify unused provisioned resource.
   </description>
   <url>https://github.com/jenkinsci/node-iterator-api-plugin</url>
+
+
+  <properties>
+    <changelist>999999-SNAPSHOT</changelist>
+    <gitHubRepo>jenkinsci/node-iterator-api-plugin</gitHubRepo>
+    <jenkins.version>2.346.1</jenkins.version>
+  </properties>
+
   <licenses>
     <license>
       <name>The MIT license</name>
@@ -64,10 +68,10 @@
   </developers>
 
   <scm>
-    <connection>scm:git:git://github.com/jenkinsci/node-iterator-api-plugin.git</connection>
-    <developerConnection>scm:git:git@github.com:jenkinsci/node-iterator-api-plugin.git</developerConnection>
-    <url>http://github.com/jenkinsci/node-iterator-api-plugin</url>
-    <tag>HEAD</tag>
+    <connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
+    <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
+    <url>http://github.com/${gitHubRepo}</url>
+    <tag>${scmTag}</tag>
   </scm>
 
   <repositories>
diff --git a/src/findbugs/excludesFilter.xml b/src/findbugs/excludesFilter.xml
deleted file mode 100644
index bd52d68..0000000
--- a/src/findbugs/excludesFilter.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<FindBugsFilter>
-  <Match>
-    <Class name="~.*\.Messages"/>
-  </Match>
-</FindBugsFilter>
diff --git a/src/main/java/jenkins/slaves/iterators/api/NodeIterator.java b/src/main/java/jenkins/slaves/iterators/api/NodeIterator.java
index ef32197..8fab8b1 100644
--- a/src/main/java/jenkins/slaves/iterators/api/NodeIterator.java
+++ b/src/main/java/jenkins/slaves/iterators/api/NodeIterator.java
@@ -206,7 +206,7 @@ private static class MetaNodeIterator<N extends Node> extends NodeIterator<N> {
                 delegate = Collections.emptyIterator();
             } else {
                 List<Node> nodes = instance.getNodes();
-                delegate = nodes == null ? Collections.<Node>emptyIterator() : nodes.iterator();
+                delegate = nodes.iterator();
             }
             this.metaIterator = metaIterator;
             this.nodeClass = nodeClass;
diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
new file mode 100644
index 0000000..d87c990
--- /dev/null
+++ b/src/main/resources/index.jelly
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The MIT License
+Copyright 2022 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'?>
+<div>
+    This plugin provides support for iterating through all the <a href="https://javadoc.jenkins.io/jenkins/model/Nodes.html">Node</a>
+    instances that are in use by <code>Jenkins</code>, even those <code>Node</code> instances that are not traditionally attached to Jenkins. The API exposed by this
+    plugin can be used by cloud provider plugins to identify unused provisioned resource.
+</div>