diff --git a/pom.xml b/pom.xml
index 114438b25..7a6dd8a97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
         <version.org.kohsuke.metainf-services>1.7</version.org.kohsuke.metainf-services>
         <version.org.wildfly.common>1.2.0.Beta3</version.org.wildfly.common>
         <version.org.wildfly.naming.client>1.0.0.Beta6</version.org.wildfly.naming.client>
-        <version.org.wildfly.discovery>1.0.0.Beta4</version.org.wildfly.discovery>
+        <version.org.wildfly.discovery>1.0.0.Beta5</version.org.wildfly.discovery>
         <version.org.wildfly.security.elytron>1.1.0.Beta17</version.org.wildfly.security.elytron>
         <version.org.wildfly.transaction-client>1.0.0.Beta3</version.org.wildfly.transaction-client>
 
diff --git a/src/main/java/org/jboss/ejb/protocol/remote/RemoteEJBDiscoveryConfigurator.java b/src/main/java/org/jboss/ejb/protocol/remote/RemoteEJBDiscoveryConfigurator.java
new file mode 100644
index 000000000..e424e81bf
--- /dev/null
+++ b/src/main/java/org/jboss/ejb/protocol/remote/RemoteEJBDiscoveryConfigurator.java
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2017 Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.ejb.protocol.remote;
+
+import java.util.function.Consumer;
+
+import org.kohsuke.MetaInfServices;
+import org.wildfly.discovery.spi.DiscoveryProvider;
+import org.wildfly.discovery.spi.ExternalDiscoveryConfigurator;
+import org.wildfly.discovery.spi.RegistryProvider;
+
+@MetaInfServices
+public final class RemoteEJBDiscoveryConfigurator implements ExternalDiscoveryConfigurator {
+    public void configure(final Consumer<DiscoveryProvider> discoveryProviderConsumer, final Consumer<RegistryProvider> registryProviderConsumer) {
+        discoveryProviderConsumer.accept(RemotingEJBDiscoveryProvider.INSTANCE);
+    }
+}