diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bcabf7f0d321764bc66e1180f0e718710e696a2..95d40dd7350df6b381278f8061fe9b781c14e0f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,14 +15,16 @@ build_and_publish:
     - mvn -U -B -DskipTests clean deploy --settings settings.xml
   only:
     - master
+    - develop
     
 # Just run tests on feature branches
 build:
   type: build
   script:
-    - mvn -U -B clean test -DskipDockerBuild -DskipDockerTag --settings settings.xml
+    - mvn -U -B clean test --settings settings.xml
   except:
     - master
+    - develop
 
 sonar_preview:
   type: sonar
@@ -30,6 +32,7 @@ sonar_preview:
     - mvn -q -U -B clean compile sonar:sonar -Dmaven.test.skip=true -Dsonar.host.url=https://en-ice-sonar.cern.ch -Dsonar.analysis.mode=preview -Dsonar.gitlab.commit_sha=$CI_BUILD_REF -Dsonar.gitlab.ref_name=$CI_BUILD_REF_NAME -Dsonar.gitlab.project_id=$CI_PROJECT_ID -Dsonar.gitlab.max_major_issues_gate=0 --settings settings.xml --debug -X
   except:
     - master
+    - develop
 
 quality_assurance:
   stage: sonar
@@ -37,3 +40,4 @@ quality_assurance:
     - mvn package dependency-check:aggregate sonar:sonar -Dmaven.test.skip=true -Dsonar.dependencyCheck.reportPath=target/dependency-check-report.xml --settings settings.xml
   only:
     - master
+    - develop
diff --git a/pom.xml b/pom.xml
index ee2f6c3086139ada12e06179267842a0ccdef4b8..76d6be0eaa81ad5f37cd4c7a073bf45f2c7acff1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,12 +36,15 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 			<version>${org.springframework.boot.version}</version>
 		</dependency>
-		
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-websocket</artifactId>
+			<version>${org.springframework.boot.version}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
-			<version>${org.springframework.boot.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -81,6 +84,12 @@
             <version>2.3.2</version>
         </dependency>
         
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-websocket</artifactId>
+            <version>${org.springframework.version}</version>
+            <scope>test</scope>
+        </dependency>
 		<dependency>
 	      <groupId>org.projectlombok</groupId>
 	      <artifactId>lombok</artifactId>