diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure
index 87245b6d3c769c464086448219cbf3e92c35f213..0f96e537b05239cee7583e1051435fb01617358a 100644
--- a/compose/docker-compose.yaml.configure
+++ b/compose/docker-compose.yaml.configure
@@ -85,7 +85,7 @@ services:
     profiles: ["prod"]
     build:
         context:  ../../org.etsi.osl.portal.api/
-        dockerfile: Dockerfile.portalapi        
+        dockerfile: Dockerfile        
     image: org.etsi.osl.portal.api:latest
     environment:
       SPRING_APPLICATION_JSON: '{
@@ -132,7 +132,7 @@ services:
     profiles: ["prod"]
     build:
         context:  ../../org.etsi.osl.mano/
-        dockerfile: Dockerfile.mano        
+        dockerfile: Dockerfile        
     image: org.etsi.osl.mano:latest
     environment:
        SPRING_APPLICATION_JSON: '{
@@ -158,7 +158,7 @@ services:
     profiles: ["prod"]
     build:
         context:  ../../org.etsi.osl.bugzilla/
-        dockerfile: Dockerfile.bugzilla        
+        dockerfile: Dockerfile        
     image: org.etsi.osl.bugzilla:latest
     environment:
       SPRING_APPLICATION_JSON: '{
@@ -184,7 +184,7 @@ services:
     profiles: ["prod"]
     build:
         context:  ../../org.etsi.osl.tmf.api/
-        dockerfile: Dockerfile.tmfapi      
+        dockerfile: Dockerfile      
     image: org.etsi.osl.tmf.api:latest
     environment:
       SPRING_APPLICATION_JSON: '{
@@ -225,7 +225,7 @@ services:
     profiles: ["prod"]
     build:
         context:  ../../org.etsi.osl.osom/
-        dockerfile: Dockerfile.osom      
+        dockerfile: Dockerfile      
     image: org.etsi.osl.osom:latest
     environment:
       SPRING_APPLICATION_JSON: '{
@@ -251,7 +251,7 @@ services:
     profiles: ["prod"]
     build:
         context:  ../../org.etsi.osl.oas/
-        dockerfile: Dockerfile.oasapi      
+        dockerfile: Dockerfile      
     image: org.etsi.osl.oas:latest
     environment:
       SPRING_APPLICATION_JSON: '{
@@ -288,7 +288,7 @@ services:
     profiles: [ "prod"]
     build:
         context:  ../../org.etsi.osl.cridge/
-        dockerfile: Dockerfile.cridge      
+        dockerfile: Dockerfile      
     image: org.etsi.osl.cridge:latest
     environment:
       SPRING_APPLICATION_JSON: '{
@@ -327,7 +327,7 @@ services:
     profiles: ["prod"]
     build:
         context:  ../../org.etsi.osl.centrallog.service/
-        dockerfile: Dockerfile.centrallog        
+        dockerfile: Dockerfile        
     image: org.etsi.osl.centrallog.service:latest
     environment:
       SPRING_APPLICATION_JSON: '{