diff --git a/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/src/main/groovy/io/codearte/accurest/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy b/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/src/main/groovy/io/codearte/accurest/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy
index 25106d5f3d..412db09b30 100644
--- a/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/src/main/groovy/io/codearte/accurest/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy
+++ b/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/src/main/groovy/io/codearte/accurest/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy
@@ -13,7 +13,6 @@ import org.springframework.integration.dsl.GenericEndpointSpec
 import org.springframework.integration.dsl.IntegrationFlowBuilder
 import org.springframework.integration.dsl.IntegrationFlows
 import org.springframework.messaging.Message
-import org.springframework.stereotype.Service
 /**
  * Spring Integration configuration that iterates over the downloaded Groovy DSLs
  * and registers a flow for each DSL.
@@ -25,7 +24,7 @@ import org.springframework.stereotype.Service
 class StubRunnerIntegrationConfiguration {
 
 	@Bean
-	FlowRegistrar service(AutowireCapableBeanFactory beanFactory, BatchStubRunner batchStubRunner) {
+	FlowRegistrar flowRegistrar(AutowireCapableBeanFactory beanFactory, BatchStubRunner batchStubRunner) {
 		Map<StubConfiguration, Collection<GroovyDsl>> accurestContracts = batchStubRunner.accurestContracts
 		accurestContracts.each { StubConfiguration key, Collection<GroovyDsl> value ->
 			String name = "${key.groupId}_${key.artifactId}"
@@ -52,6 +51,5 @@ class StubRunnerIntegrationConfiguration {
 		void handle(Message message) {}
 	}
 
-	@Service
 	static class FlowRegistrar {}
 }
diff --git a/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/src/main/groovy/io/codearte/accurest/stubrunner/messaging/stream/StubRunnerStreamConfiguration.groovy b/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/src/main/groovy/io/codearte/accurest/stubrunner/messaging/stream/StubRunnerStreamConfiguration.groovy
index 3d3210ff7e..0085c1724d 100644
--- a/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/src/main/groovy/io/codearte/accurest/stubrunner/messaging/stream/StubRunnerStreamConfiguration.groovy
+++ b/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/src/main/groovy/io/codearte/accurest/stubrunner/messaging/stream/StubRunnerStreamConfiguration.groovy
@@ -16,7 +16,6 @@ import org.springframework.integration.dsl.IntegrationFlowBuilder
 import org.springframework.integration.dsl.IntegrationFlows
 import org.springframework.messaging.Message
 import org.springframework.messaging.MessageChannel
-import org.springframework.stereotype.Service
 /**
  * Spring Cloud Stream configuration that iterates over the downloaded Groovy DSLs
  * and registers a flow for each DSL.
@@ -29,7 +28,7 @@ import org.springframework.stereotype.Service
 class StubRunnerStreamConfiguration {
 
 	@Bean
-	FlowRegistrar service(AutowireCapableBeanFactory beanFactory, BatchStubRunner batchStubRunner, ChannelBindingService channelBindingService) {
+	FlowRegistrar flowRegistrar(AutowireCapableBeanFactory beanFactory, BatchStubRunner batchStubRunner, ChannelBindingService channelBindingService) {
 		Map<StubConfiguration, Collection<GroovyDsl>> accurestContracts = batchStubRunner.accurestContracts
 		accurestContracts.each { StubConfiguration key, Collection<GroovyDsl> value ->
 			String name = "${key.groupId}_${key.artifactId}"
@@ -60,6 +59,5 @@ class StubRunnerStreamConfiguration {
 		void handle(Message message) {}
 	}
 
-	@Service
 	static class FlowRegistrar {}
 }