diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1967e4afeacc6e81ad68eca7d0ccb97337f32f3d..0c75422c10797b077e4e923971bf97fa649fd526 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,13 +31,6 @@ build-metadata-db:
   script:
     - "make build-metadata-db"
 
-build-authentication-service:
-  stage: build-backend
-  needs:
-    - build-metadata-db
-  script:
-    - "make build-authentication-service"
-
 build-identifier-service:
   stage: build-backend
   needs:
@@ -104,27 +97,10 @@ build-analyse-service:
   script:
     - "make build-analyse-service"
 
-test-backend-authentication:
-  stage: test-backend
-  needs:
-    - build-authentication-service
-  script:
-    - "make test-authentication-service"
-    - "cat ./fda-authentication-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
-  artifacts:
-    when: always
-    paths:
-      - ./fda-authentication-service/report/target/site/jacoco-aggregate/
-      - ./fda-authentication-service/rest-service/target/surefire-reports/
-    expire_in: 1 days
-    reports:
-      junit: ./fda-authentication-service/rest-service/target/surefire-reports/TEST-*.xml
-  coverage: '/Total.*?([0-9]{1,3})%/'
-
 test-identifier-service:
   stage: test-backend
   needs:
-    - build-authentication-service
+    - build-identifier-service
   script:
     - "make test-identifier-service"
     - "cat ./fda-identifier-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
@@ -312,7 +288,6 @@ build-docker:
   stage: build-docker
   needs:
     - build-metadata-db
-    - build-authentication-service
     - build-identifier-service
     - build-container-service
     - build-database-service
diff --git a/Makefile b/Makefile
index a5bce8de2e48b1547e456f13be75256590b415c9..405056574e1c10722ee38166ffda3db002f6ebbb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,11 @@ TAG ?= latest
 
 all:
 
-build-backend: build-metadata-db build-database-service build-query-service build-table-service build-identifier-service build-authentication-service build-container-service build-discovery-service build-gateway-service build-metadata-service build-analyse-service
+build-backend: build-metadata-db build-database-service build-query-service build-table-service build-identifier-service build-container-service build-discovery-service build-gateway-service build-metadata-service build-analyse-service
 
 build-metadata-db:
 	mvn -f ./fda-metadata-db/pom.xml clean install
 
-build-authentication-service: build-metadata-db
-	mvn -f ./fda-authentication-service/pom.xml clean package -DskipTests
-
 build-identifier-service: build-metadata-db
 	mvn -f ./fda-identifier-service/pom.xml clean package -DskipTests
 
@@ -147,11 +144,7 @@ release-search:
 release-metadata:
 	docker push "dbrepo/metadata-service:${TAG}"
 
-test-backend: test-authentication-service test-container-service test-database-service test-discovery-service test-gateway-service test-query-service test-table-service test-identifier-service test-metadata-service test-semantics-service test-analyse-service
-
-test-authentication-service: clean build-metadata-db build-authentication-service
-	docker pull rabbitmq:3-management-alpine
-	mvn -f ./fda-authentication-service/pom.xml clean test verify
+test-backend: test-container-service test-database-service test-discovery-service test-gateway-service test-query-service test-table-service test-identifier-service test-metadata-service test-semantics-service test-analyse-service
 
 test-identifier-service: clean build-metadata-db build-identifier-service
 	mvn -f ./fda-identifier-service/pom.xml clean test verify