diff --git a/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonRuntimeServiceImpl.java b/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonRuntimeServiceImpl.java
index 0608a6044d..1e9c44b4c3 100644
--- a/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonRuntimeServiceImpl.java
+++ b/runtime-management/runtime-management-impl/src/main/java/io/cloudslang/runtime/impl/python/PythonRuntimeServiceImpl.java
@@ -12,7 +12,7 @@
 
 import io.cloudslang.runtime.api.python.PythonRuntimeService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -21,7 +21,7 @@
 /**
  * Created by Genadi Rabinovich, genadi@hpe.com on 05/05/2016.
  */
-@Component
+@Service
 public class PythonRuntimeServiceImpl implements PythonRuntimeService {
     @Autowired
     private PythonExecutionEngine pythonExecutionEngine;