diff --git a/pom.xml b/pom.xml
index 7879fd4fb..374702930 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,12 +124,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.kohsuke.metainf-services</groupId>
-      <artifactId>metainf-services</artifactId>
-      <version>1.11</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.xmlunit</groupId>
       <artifactId>xmlunit-matchers</artifactId>
diff --git a/src/main/java/com/cloudbees/plugins/credentials/cli/CredentialsStoreOptionHandler.java b/src/main/java/com/cloudbees/plugins/credentials/cli/CredentialsStoreOptionHandler.java
index 9a57ff931..bac04ad8a 100644
--- a/src/main/java/com/cloudbees/plugins/credentials/cli/CredentialsStoreOptionHandler.java
+++ b/src/main/java/com/cloudbees/plugins/credentials/cli/CredentialsStoreOptionHandler.java
@@ -25,7 +25,7 @@
 
 import com.cloudbees.plugins.credentials.CredentialsSelectHelper;
 import com.cloudbees.plugins.credentials.CredentialsStore;
-import org.kohsuke.MetaInfServices;
+import hudson.cli.declarative.OptionHandlerExtension;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.OptionDef;
@@ -38,7 +38,7 @@
  *
  * @since 2.1.1
  */
-@MetaInfServices(OptionHandler.class)
+@OptionHandlerExtension
 public class CredentialsStoreOptionHandler extends OptionHandler<CredentialsStore> {
     /**
      * {@inheritDoc}