diff --git a/stub-runner/stub-runner-spring-cloud/README.md b/stub-runner/stub-runner-spring-cloud/README.md
index 06399b13a0..0d7b496245 100644
--- a/stub-runner/stub-runner-spring-cloud/README.md
+++ b/stub-runner/stub-runner-spring-cloud/README.md
@@ -9,5 +9,7 @@ io.codearte.accurest:stub-runner-spring-cloud
 
 and the Stub Runner autoconfiguration should be picked up.
 
-In order to find the registered server via service discovery, you have to use the 
-`artifactId` as the name of the application
\ No newline at end of file
+You can match the artifactId of the stub with the name of your app by using the `stubrunner.stubs.idsToServiceIds:` map.
+
+You can disable Stub Runner Ribbon support by providing: `stubrunner.cloud.ribbon.enabled` equal to `false`
+You can disable Stub Runner support by providing: `stubrunner.cloud.enabled` equal to `false`
\ No newline at end of file
diff --git a/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java b/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java
index b759304230..cf4c9d0928 100644
--- a/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java
+++ b/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java
@@ -2,6 +2,7 @@ package io.codearte.accurest.stubrunner.spring.cloud;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.context.annotation.Bean;
@@ -20,6 +21,7 @@ import io.codearte.accurest.stubrunner.spring.StubRunnerConfiguration;
 @EnableConfigurationProperties
 @ConditionalOnClass(DiscoveryClient.class)
 @Import(StubRunnerConfiguration.class)
+@ConditionalOnProperty(value = "stubrunner.cloud.enabled", matchIfMissing = true)
 public class StubRunnerSpringCloudAutoConfiguration {
 
 	@Bean
diff --git a/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonAutoConfiguration.java b/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonAutoConfiguration.java
index 523f499076..e54b825ec7 100644
--- a/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonAutoConfiguration.java
+++ b/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonAutoConfiguration.java
@@ -1,17 +1,23 @@
 package io.codearte.accurest.stubrunner.spring.cloud.ribbon;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
 import org.springframework.cloud.netflix.ribbon.RibbonClients;
 import org.springframework.context.annotation.Configuration;
 
 import com.netflix.loadbalancer.ServerList;
 
+import io.codearte.accurest.stubrunner.spring.cloud.StubMapperProperties;
+
 @Configuration
 @ConditionalOnClass(ServerList.class)
+@ConditionalOnBean(StubMapperProperties.class)
 @AutoConfigureAfter(RibbonAutoConfiguration.class)
 @RibbonClients(defaultConfiguration = StubRunnerRibbonConfiguration.class)
+@ConditionalOnProperty(value = "stubrunner.cloud.ribbon.enabled", matchIfMissing = true)
 public class StubRunnerRibbonAutoConfiguration {
 
 }
diff --git a/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java b/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java
index dc2735c0cd..b55e1960a8 100644
--- a/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java
+++ b/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java
@@ -1,7 +1,5 @@
 package io.codearte.accurest.stubrunner.spring.cloud.ribbon;
 
-import java.net.URI;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;