diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 225c156b0bf10d87973c8788f81966509ac425cf..d111396b656abfa6ed2b99dda3e3244df2c3e68d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,11 +3,20 @@ stages:
   - deploy 
   - sonar
 
-# Get the settings file from c2mon project
-before_script:
-  - wget https://gitlab.cern.ch/c2mon/c2mon/raw/master/settings.xml
+image: 
+  name: gitlab-registry.cern.ch/industrial-controls/sw-infra/cc7-maven:jdk-11-mvn-3.6-1
+  entrypoint: [""]   
 
 
+variables:
+  MAVEN_CLI_OPTS:
+    -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository
+      --batch-mode --errors --show-version --settings settings-ci.xml
+
+default:
+  before_script:
+    - curl https://cern.ch/maven/settings-ci.xml -o settings.xml
+
 # Fully build and publish master branch
 build_and_publish:
   type: deploy
@@ -25,6 +34,7 @@ build:
   except:
     - master
     - develop
+    - tags
 
 sonar_preview:
   type: sonar
@@ -32,7 +42,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
+    - tags
 
 quality_assurance:
   stage: sonar
@@ -40,4 +50,3 @@ quality_assurance:
     - mvn package sonar:sonar -Dmaven.test.skip=true -Dsonar.dependencyCheck.reportPath=target/dependency-check-report.xml --settings settings.xml
   only:
     - master
-    - develop