diff --git a/pom.xml b/pom.xml
index 556bb68..bd864b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.github.privaliatech</groupId>
     <artifactId>gingerspec-starter</artifactId>
-    <version>1.17</version>
+    <version>1.18</version>
 
     <name>Archetype - gingerspec-starter</name>
     <description>A maven archetype for creating new automation projects based on gingerspec library.</description>
diff --git a/src/main/resources/archetype-resources/.gitlab-ci.yml b/src/main/resources/archetype-resources/.gitlab-ci.yml
index b0499eb..f8bf3d2 100644
--- a/src/main/resources/archetype-resources/.gitlab-ci.yml
+++ b/src/main/resources/archetype-resources/.gitlab-ci.yml
@@ -16,7 +16,7 @@
 
 
 # This template uses jdk11 for for running tests
-image: core-qms-docker.registry.vptech.eu/maven:3.6.1-jdk-11
+image: docker.registry.vptech.eu/maven:3.8.5-jdk-11
 
 
 # Cache downloaded dependencies and plugins between builds.
@@ -31,7 +31,7 @@ cache:
 UITest:
   stage: test
   services:
-    - name: core-qms-docker.registry.vptech.eu/selenium/standalone-chrome:3.141.59
+    - name: docker.registry.vptech.eu/selenium/standalone-chrome:3.141.59
       alias: node
   script:
     - 'mvn verify -Dcucumber.filter.tags="@web" -DSELENIUM_GRID=http://node:4444/wd/hub'