diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb5d2b0f0b818a11c7084f635a1478a1ac5d199d..f0ccbc0181370309ff4f9d9313f3762b78c6ee12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,9 +69,8 @@ build_and_deploy:
   script:
     - 'git submodule init'
     - 'git submodule update'
-    # REMOVE SKIPTESTS AND USE VERIFY AS SOON AS BOTH ARE FIXED...!!
-#    - 'mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS-U clean verify -Ptextgrid.deb'
-    - 'mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean package -Ptextgrid.deb -DskipTests=true'
+    # REMOVE SKIPTESTS AS SOON AS TESTS ARE WORKING...!!
+    - 'mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean verify -Ptextgrid.deb -DskipTests=true'
   artifacts:
     name: WEBAPP_DEB_PACKAGES
     paths:
diff --git a/pom.xml b/pom.xml
index f8fa09dbfd2a0e23cd401aa5a6cb19e9cbd91167..4d793036e24de8189d0e7d529193ea6091e85d7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,9 @@
 		<junit-version>4.13.2</junit-version>
 		<spring-version>3.2.2.RELEASE</spring-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
+		<git-commit-id-plugin.version>2.1.15</git-commit-id-plugin.version>
+		<maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
+		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
 		<!-- The following properties are used for configuring the web service
 			and can be overridden in profiles -->
 		<aggregator.endpoint.published>http://localhost:13000/aggregator</aggregator.endpoint.published>
@@ -210,6 +212,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
+					<version>${maven-compiler-plugin.version}</version>
 					<configuration>
 						<source>${java-source.version}</source>
 						<target>${java-target.version}</target>
@@ -218,6 +221,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-eclipse-plugin</artifactId>
+					<version>${maven-eclipse-plugin.version}</version>
 					<configuration>
 						<projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
 						<wtpmanifest>true</wtpmanifest>
@@ -266,7 +270,7 @@
 <!-- 
 				<version>2.1.5</version>
 -->
-				<version>2.1.15</version>
+				<version>${git-commit-id-plugin.version}</version>
 				<executions>
 					<execution>
 						<goals>
@@ -288,7 +292,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.1</version>
 				<configuration>
 					<source>${java-source.version}</source>
 					<target>${java-target.version}</target>