diff --git a/core/jobs/pom.xml b/core/jobs/pom.xml
index 2347e6c57..6ec38a368 100644
--- a/core/jobs/pom.xml
+++ b/core/jobs/pom.xml
@@ -35,6 +35,18 @@
 
   <dependencies>
     <!-- project -->
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.component.annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.metatype.annotations</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.cognifide.aet</groupId>
       <artifactId>communication-api</artifactId>
@@ -78,10 +90,6 @@
       <groupId>com.googlecode.java-diff-utils</groupId>
       <artifactId>diffutils</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.commons.osgi</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>fluent-hc</artifactId>
@@ -96,11 +104,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.scr.annotations</artifactId>
-    </dependency>
-
     <!-- test dependencies -->
     <dependency>
       <groupId>junit</groupId>
@@ -163,6 +166,18 @@
 
   <build>
     <plugins>
+      <!-- overwrites configuration from parent pom to disable SCR plugin -->
+      <!-- ToDo: remove me when all felix dependencies are removed -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-scr-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-scr-descriptor</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/accessibility/AccessibilityCollectorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/accessibility/AccessibilityCollectorFactory.java
index 0d8ec20ca..ba2a0b5db 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/accessibility/AccessibilityCollectorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/accessibility/AccessibilityCollectorFactory.java
@@ -22,14 +22,12 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
 import org.osgi.framework.BundleContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class AccessibilityCollectorFactory implements CollectorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/cookie/CookieCollectorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/cookie/CookieCollectorFactory.java
index 2bfae12b9..eff21fbbd 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/cookie/CookieCollectorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/cookie/CookieCollectorFactory.java
@@ -22,12 +22,10 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class CookieCollectorFactory implements CollectorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/jserrors/JsErrorsCollectorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/jserrors/JsErrorsCollectorFactory.java
index 87a23cced..f0ccead64 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/jserrors/JsErrorsCollectorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/jserrors/JsErrorsCollectorFactory.java
@@ -22,12 +22,10 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class JsErrorsCollectorFactory implements CollectorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/open/OpenPageFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/open/OpenPageFactory.java
index d4123f41d..c04f50e2e 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/open/OpenPageFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/open/OpenPageFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class OpenPageFactory implements CollectorFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/performance/clientside/ClientSidePerformanceCollectorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/performance/clientside/ClientSidePerformanceCollectorFactory.java
index a4f147f8e..2bab04bff 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/performance/clientside/ClientSidePerformanceCollectorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/performance/clientside/ClientSidePerformanceCollectorFactory.java
@@ -22,14 +22,12 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
 import org.osgi.framework.BundleContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class ClientSidePerformanceCollectorFactory implements CollectorFactory {
 
   private BundleContext context;
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/screen/ScreenCollectorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/screen/ScreenCollectorFactory.java
index 48771238b..2051f6389 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/screen/ScreenCollectorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/screen/ScreenCollectorFactory.java
@@ -22,12 +22,10 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
-@Component(description = "AET Screen Collector Factory", label = "AET Screen Collector Factory")
-@Service
+@Component(service = CollectorFactory.class)
 public class ScreenCollectorFactory implements CollectorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/source/SourceCollectorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/source/SourceCollectorFactory.java
index 559886bfe..81e54a540 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/source/SourceCollectorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/source/SourceCollectorFactory.java
@@ -20,25 +20,19 @@
 import com.cognifide.aet.job.api.collector.CollectorProperties;
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
+import com.cognifide.aet.job.common.collectors.source.configuration.SourceCollectorFactoryConf;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.commons.osgi.PropertiesUtil;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.metatype.annotations.Designate;
 
-@Component(metatype = true, description = "AET Source Collector Factory", label = "AET Source Collector Factory")
-@Service
+@Component(service = CollectorFactory.class)
+@Designate(ocd = SourceCollectorFactoryConf.class)
 public class SourceCollectorFactory implements CollectorFactory {
 
-  private static final String SOURCE_COLLECTOR_TIMEOUT_VALUE = "sourceCollectorTimeoutValue";
-
-  private static final int DEFAULT_TIMEOUT = 20000;
-
-  @Property(name = SOURCE_COLLECTOR_TIMEOUT_VALUE, label = "Timeout value for source collector [ms]", intValue = DEFAULT_TIMEOUT, description = "Timeout value for source collector [ms]")
-  private int timeoutValue;
+  SourceCollectorFactoryConf config;
 
   @Reference
   private ArtifactsDAO artifactsDAO;
@@ -53,13 +47,12 @@ public CollectorJob createInstance(CollectorProperties properties, Map<String, S
       WebCommunicationWrapper webCommunicationWrapper)
       throws ParametersException {
     return new SourceCollector(artifactsDAO, properties,
-        webCommunicationWrapper.getHttpRequestExecutor(), timeoutValue);
+        webCommunicationWrapper.getHttpRequestExecutor(), config.timeoutValue());
   }
 
   @Activate
-  public void activate(Map properties) {
-    timeoutValue = PropertiesUtil
-        .toInteger(properties.get(SOURCE_COLLECTOR_TIMEOUT_VALUE), DEFAULT_TIMEOUT);
+  public void activate(SourceCollectorFactoryConf config) {
+    this.config = config;
   }
 
 }
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/source/configuration/SourceCollectorFactoryConf.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/source/configuration/SourceCollectorFactoryConf.java
new file mode 100644
index 000000000..b0e5dc4b0
--- /dev/null
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/source/configuration/SourceCollectorFactoryConf.java
@@ -0,0 +1,35 @@
+/**
+ * AET
+ *
+ * Copyright (C) 2013 Cognifide Limited
+ *
+ * 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 com.cognifide.aet.job.common.collectors.source.configuration;
+
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.AttributeType;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+@ObjectClassDefinition(name = "AET Source Collector Factory", description = "AET Source Collector Factory")
+public @interface SourceCollectorFactoryConf {
+
+  String SOURCE_COLLECTOR_TIMEOUT_VALUE = "sourceCollectorTimeoutValue";
+
+  int DEFAULT_TIMEOUT = 20000;
+
+  @AttributeDefinition(
+      name = SOURCE_COLLECTOR_TIMEOUT_VALUE,
+      description =  "Timeout value for source collector [ms]",
+      type = AttributeType.INTEGER)
+  int timeoutValue() default  DEFAULT_TIMEOUT;
+
+}
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/statuscodes/StatusCodesCollectorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/statuscodes/StatusCodesCollectorFactory.java
index b9249db8a..d38aa20bb 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/statuscodes/StatusCodesCollectorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/collectors/statuscodes/StatusCodesCollectorFactory.java
@@ -22,12 +22,10 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class StatusCodesCollectorFactory implements CollectorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/accessibility/AccessibilityComparatorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/accessibility/AccessibilityComparatorFactory.java
index 98e5d51f0..9a8239e1c 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/accessibility/AccessibilityComparatorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/accessibility/AccessibilityComparatorFactory.java
@@ -23,12 +23,10 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.List;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class AccessibilityComparatorFactory implements ComparatorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/cookie/CookieComparatorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/cookie/CookieComparatorFactory.java
index 6f0e72ef9..e6760ad6b 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/cookie/CookieComparatorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/cookie/CookieComparatorFactory.java
@@ -23,12 +23,10 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.List;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class CookieComparatorFactory implements ComparatorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/jserrors/JsErrorsComparatorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/jserrors/JsErrorsComparatorFactory.java
index 87fd83c67..8df097777 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/jserrors/JsErrorsComparatorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/jserrors/JsErrorsComparatorFactory.java
@@ -23,12 +23,10 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.List;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class JsErrorsComparatorFactory implements ComparatorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/layout/LayoutComparatorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/layout/LayoutComparatorFactory.java
index 1e48d5a6a..ee487db23 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/layout/LayoutComparatorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/layout/LayoutComparatorFactory.java
@@ -23,12 +23,10 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.List;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class LayoutComparatorFactory implements ComparatorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/permormance/clientside/ClientSidePerformanceComparatorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/permormance/clientside/ClientSidePerformanceComparatorFactory.java
index 846c2284d..9bb9453ea 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/permormance/clientside/ClientSidePerformanceComparatorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/permormance/clientside/ClientSidePerformanceComparatorFactory.java
@@ -24,12 +24,10 @@
 import com.cognifide.aet.job.common.comparators.permormance.clientside.parser.ClientSidePerformanceParser;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.List;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class ClientSidePerformanceComparatorFactory implements ComparatorFactory {
 
   private final ClientSidePerformanceParser clientSidePerformanceParser = new ClientSidePerformanceParser();
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/source/SourceComparatorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/source/SourceComparatorFactory.java
index 609d5ee58..527f918d7 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/source/SourceComparatorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/source/SourceComparatorFactory.java
@@ -24,12 +24,10 @@
 import com.cognifide.aet.job.common.comparators.source.diff.DiffParser;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.List;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class SourceComparatorFactory implements ComparatorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/statuscodes/StatusCodesComparatorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/statuscodes/StatusCodesComparatorFactory.java
index ac0902629..745a12676 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/statuscodes/StatusCodesComparatorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/statuscodes/StatusCodesComparatorFactory.java
@@ -23,15 +23,12 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.List;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class StatusCodesComparatorFactory implements ComparatorFactory {
 
-
   @Reference
   private ArtifactsDAO artifactsDAO;
 
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/w3chtml5/W3cHtml5ComparatorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/w3chtml5/W3cHtml5ComparatorFactory.java
index fe6a12378..c51f6088a 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/w3chtml5/W3cHtml5ComparatorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/comparators/w3chtml5/W3cHtml5ComparatorFactory.java
@@ -25,12 +25,10 @@
 import com.cognifide.aet.job.common.comparators.w3chtml5.wrapper.NuValidatorWrapper;
 import com.cognifide.aet.vs.ArtifactsDAO;
 import java.util.List;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class W3cHtml5ComparatorFactory implements ComparatorFactory {
 
   private final W3cHtml5ValidationResultParser resultParser = new W3cHtml5ValidationResultParser();
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/accessibilityfilter/AccessibilityFilterFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/accessibilityfilter/AccessibilityFilterFactory.java
index 50e6beaac..a300bc6d8 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/accessibilityfilter/AccessibilityFilterFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/accessibilityfilter/AccessibilityFilterFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.common.collectors.accessibility.AccessibilityIssue;
 import java.util.List;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class AccessibilityFilterFactory implements DataFilterFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/extractelement/ExtractElementDataFilterFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/extractelement/ExtractElementDataFilterFactory.java
index 7a60bb542..e1c9d73b6 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/extractelement/ExtractElementDataFilterFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/extractelement/ExtractElementDataFilterFactory.java
@@ -19,14 +19,12 @@
 import com.cognifide.aet.job.api.datafilter.DataFilterJob;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 /**
  * @author magdalena.biala
  */
 @Component
-@Service
 public class ExtractElementDataFilterFactory implements DataFilterFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/jserrorsfilter/JsErrorsFilterFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/jserrorsfilter/JsErrorsFilterFactory.java
index 476f74978..9f6e5db20 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/jserrorsfilter/JsErrorsFilterFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/jserrorsfilter/JsErrorsFilterFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
 import java.util.Set;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class JsErrorsFilterFactory implements DataFilterFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removelines/RemoveLinesDataFilterFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removelines/RemoveLinesDataFilterFactory.java
index 7d4897b5b..b5913e08f 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removelines/RemoveLinesDataFilterFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removelines/RemoveLinesDataFilterFactory.java
@@ -19,11 +19,9 @@
 import com.cognifide.aet.job.api.datafilter.DataFilterJob;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class RemoveLinesDataFilterFactory implements DataFilterFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removenodes/RemoveNodesDataFilterFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removenodes/RemoveNodesDataFilterFactory.java
index 9c4da0d5c..561763fd8 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removenodes/RemoveNodesDataFilterFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removenodes/RemoveNodesDataFilterFactory.java
@@ -19,11 +19,9 @@
 import com.cognifide.aet.job.api.datafilter.DataFilterJob;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class RemoveNodesDataFilterFactory implements DataFilterFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removeregexp/RemoveRegexpDataFilterFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removeregexp/RemoveRegexpDataFilterFactory.java
index b01233ed1..717a92348 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removeregexp/RemoveRegexpDataFilterFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/removeregexp/RemoveRegexpDataFilterFactory.java
@@ -19,11 +19,9 @@
 import com.cognifide.aet.job.api.datafilter.DataFilterJob;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class RemoveRegexpDataFilterFactory implements DataFilterFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/statuscodesfilter/ExcludeStatusCodesFilterFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/statuscodesfilter/ExcludeStatusCodesFilterFactory.java
index 932044943..9ccecd95d 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/statuscodesfilter/ExcludeStatusCodesFilterFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/statuscodesfilter/ExcludeStatusCodesFilterFactory.java
@@ -20,11 +20,9 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.job.common.collectors.statuscodes.StatusCodesCollectorResult;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class ExcludeStatusCodesFilterFactory implements DataFilterFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/statuscodesfilter/IncludeStatusCodesFilterFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/statuscodesfilter/IncludeStatusCodesFilterFactory.java
index 013b8a459..e57340448 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/statuscodesfilter/IncludeStatusCodesFilterFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/statuscodesfilter/IncludeStatusCodesFilterFactory.java
@@ -20,11 +20,9 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.job.common.collectors.statuscodes.StatusCodesCollectorResult;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class IncludeStatusCodesFilterFactory implements DataFilterFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/w3chtmlfilter/W3cHtml5FilterFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/w3chtmlfilter/W3cHtml5FilterFactory.java
index 76d740e09..6502acf4f 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/w3chtmlfilter/W3cHtml5FilterFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/datafilters/w3chtmlfilter/W3cHtml5FilterFactory.java
@@ -19,11 +19,9 @@
 import com.cognifide.aet.job.api.datafilter.DataFilterJob;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class W3cHtml5FilterFactory implements DataFilterFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/click/ClickModiferFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/click/ClickModiferFactory.java
index bc82b1558..e7a1d5322 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/click/ClickModiferFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/click/ClickModiferFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class ClickModiferFactory implements CollectorFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/cookie/CookieModifierFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/cookie/CookieModifierFactory.java
index 3a5550bd2..6258c39b6 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/cookie/CookieModifierFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/cookie/CookieModifierFactory.java
@@ -22,12 +22,10 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.validation.ValidationResultBuilderFactory;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class CookieModifierFactory implements CollectorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/executejavascript/ExecuteJavaScriptModifierFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/executejavascript/ExecuteJavaScriptModifierFactory.java
index 7b7637e03..cac8c9abd 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/executejavascript/ExecuteJavaScriptModifierFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/executejavascript/ExecuteJavaScriptModifierFactory.java
@@ -21,12 +21,10 @@
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 @Component
-@Service
 public class ExecuteJavaScriptModifierFactory implements CollectorFactory {
 
   @Reference
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/executejavascript/ExternalSnippetHttpClient.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/executejavascript/ExternalSnippetHttpClient.java
index 3268d46d2..5fd10d9cf 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/executejavascript/ExternalSnippetHttpClient.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/executejavascript/ExternalSnippetHttpClient.java
@@ -16,19 +16,14 @@
 package com.cognifide.aet.job.common.modifiers.executejavascript;
 
 import com.cognifide.aet.job.api.exceptions.ProcessingException;
+import com.cognifide.aet.job.common.modifiers.executejavascript.configuration.ExternalSnippetHttpClientConf;
 import com.google.common.base.Charsets;
 import com.google.common.io.CharStreams;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.StopWatch;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -37,42 +32,31 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.sling.commons.osgi.PropertiesUtil;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.metatype.annotations.Designate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Component
-@Service(ExternalSnippetHttpClient.class)
+@Component(service = ExternalSnippetHttpClient.class)
+@Designate(ocd = ExternalSnippetHttpClientConf.class)
 public class ExternalSnippetHttpClient {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ExternalSnippetHttpClient.class);
 
-  private static final long DEFAULT_CONNECTION_TTL = 60L;
-  private static final int DEFAULT_MAX_CONCURRENT_CONNECTIONS = 50;
-
-  @Property(label = "Time in seconds that defines maximum life span of persistent connections regardless of their expiration setting",
-      longValue = DEFAULT_CONNECTION_TTL)
-  private static final String CONNECTION_TTL_PARAMETER = "connectionTtl";
-
-  @Property(label = "The maximal number of concurrent connections this service can provide. Connections over this limit are rejected.",
-      intValue = DEFAULT_MAX_CONCURRENT_CONNECTIONS)
-  private static final String MAX_CONCURRENT_CONNECTIONS_PARAMETER = "maxConcurrentConnections";
-
   private CloseableHttpClient httpClient;
 
+  private ExternalSnippetHttpClientConf config;
+
   @Activate
-  protected void activate(Map<String, Object> properties) {
+  protected void activate(ExternalSnippetHttpClientConf config) {
     LOGGER.info("Activating ExternalSnippetHttpClient - {}", this);
-
-    Long connectionTtl = PropertiesUtil
-        .toLong(properties.get(CONNECTION_TTL_PARAMETER), DEFAULT_CONNECTION_TTL);
-    Integer maxConcurrentConnections = PropertiesUtil
-        .toInteger(properties.get(MAX_CONCURRENT_CONNECTIONS_PARAMETER),
-            DEFAULT_MAX_CONCURRENT_CONNECTIONS);
+    this.config = config;
 
     final PoolingHttpClientConnectionManager poolingConnManager =
-        new PoolingHttpClientConnectionManager(connectionTtl, TimeUnit.SECONDS);
-    poolingConnManager.setMaxTotal(maxConcurrentConnections);
+        new PoolingHttpClientConnectionManager(config.connectionTtl(), TimeUnit.SECONDS);
+    poolingConnManager.setMaxTotal(config.maxConcurrentConnections());
 
     httpClient = HttpClients.custom().setConnectionManager(poolingConnManager).build();
   }
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/executejavascript/configuration/ExternalSnippetHttpClientConf.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/executejavascript/configuration/ExternalSnippetHttpClientConf.java
new file mode 100644
index 000000000..9edf63c8a
--- /dev/null
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/executejavascript/configuration/ExternalSnippetHttpClientConf.java
@@ -0,0 +1,40 @@
+/**
+ * AET
+ *
+ * Copyright (C) 2013 Cognifide Limited
+ *
+ * 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 com.cognifide.aet.job.common.modifiers.executejavascript.configuration;
+
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.AttributeType;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+@ObjectClassDefinition()
+public @interface ExternalSnippetHttpClientConf {
+
+  long DEFAULT_CONNECTION_TTL = 60L;
+
+  int DEFAULT_MAX_CONCURRENT_CONNECTIONS = 50;
+
+  @AttributeDefinition(
+      name = "Time in seconds that defines maximum life span of persistent connections regardless of their expiration setting",
+      type = AttributeType.LONG)
+  long connectionTtl() default DEFAULT_CONNECTION_TTL;
+
+  @AttributeDefinition(
+      name = "The maximal number of concurrent connections this service can provide. Connections over this limit are rejected.",
+      type = AttributeType.INTEGER)
+  int maxConcurrentConnections() default DEFAULT_MAX_CONCURRENT_CONNECTIONS;
+
+
+}
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/header/HeaderModifierFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/header/HeaderModifierFactory.java
index aa61452d9..a77b962af 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/header/HeaderModifierFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/header/HeaderModifierFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class HeaderModifierFactory implements CollectorFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/hide/HideModifierFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/hide/HideModifierFactory.java
index 0607711e6..acb13582f 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/hide/HideModifierFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/hide/HideModifierFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class HideModifierFactory implements CollectorFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/login/LoginModifierFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/login/LoginModifierFactory.java
index 72d1a1b48..b8cea68cd 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/login/LoginModifierFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/login/LoginModifierFactory.java
@@ -22,16 +22,12 @@
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import com.cognifide.aet.validation.ValidationResultBuilderFactory;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
-
-@Service
 @Component
 public class LoginModifierFactory implements CollectorFactory {
 
-
   @Reference
   private ValidationResultBuilderFactory validationResultBuilderFactory;
 
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/replacetext/ReplaceTextFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/replacetext/ReplaceTextFactory.java
index 9c884c7b0..e3dc15da7 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/replacetext/ReplaceTextFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/replacetext/ReplaceTextFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class ReplaceTextFactory implements CollectorFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/resolution/ResolutionModifierFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/resolution/ResolutionModifierFactory.java
index 6da70c7d3..c31626efc 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/resolution/ResolutionModifierFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/resolution/ResolutionModifierFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class ResolutionModifierFactory implements CollectorFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/sleep/SleepModifierFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/sleep/SleepModifierFactory.java
index 65c9bd8b1..edc30e68f 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/sleep/SleepModifierFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/sleep/SleepModifierFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class SleepModifierFactory implements CollectorFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitfor/elementtobevisible/WaitForElementToBeVisibleModifierCollectorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitfor/elementtobevisible/WaitForElementToBeVisibleModifierCollectorFactory.java
index c8399fd2f..0d8ad04bc 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitfor/elementtobevisible/WaitForElementToBeVisibleModifierCollectorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitfor/elementtobevisible/WaitForElementToBeVisibleModifierCollectorFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class WaitForElementToBeVisibleModifierCollectorFactory implements CollectorFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitfor/imagecompletion/WaitForImageCompletionModifierCollectorFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitfor/imagecompletion/WaitForImageCompletionModifierCollectorFactory.java
index 540fda14b..730088919 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitfor/imagecompletion/WaitForImageCompletionModifierCollectorFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitfor/imagecompletion/WaitForImageCompletionModifierCollectorFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class WaitForImageCompletionModifierCollectorFactory implements CollectorFactory {
 
   @Override
diff --git a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitforpageloaded/WaitForPageLoadedModifierFactory.java b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitforpageloaded/WaitForPageLoadedModifierFactory.java
index 7a87dc2d9..f7cc4978c 100644
--- a/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitforpageloaded/WaitForPageLoadedModifierFactory.java
+++ b/core/jobs/src/main/java/com/cognifide/aet/job/common/modifiers/waitforpageloaded/WaitForPageLoadedModifierFactory.java
@@ -21,11 +21,9 @@
 import com.cognifide.aet.job.api.collector.WebCommunicationWrapper;
 import com.cognifide.aet.job.api.exceptions.ParametersException;
 import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
 @Component
-@Service
 public class WaitForPageLoadedModifierFactory implements CollectorFactory {
 
   @Override
diff --git a/pom.xml b/pom.xml
index 0d78e339e..731dd45b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,24 @@
       </dependency>
 
       <!-- osgi -->
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.service.component.annotations</artifactId>
+        <version>1.3.0</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.annotation</artifactId>
+        <version>6.0.0</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.service.metatype.annotations</artifactId>
+        <version>1.3.0</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>