diff --git a/buildspec.yml b/buildspec.yml
index 252cec9..fb479d8 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -33,33 +33,61 @@ phases:
       - |
         docker buildx build --platform linux/arm64,linux/amd64 \
           -t ${ECR_REGISTRY}/merritt-maven:dev \
-          --build-arg ECR_REGISTRY=${ECR_REGISTRY} --build-arg JAVA_RELEASE_ARG=${JAVA_RELEASE:-8} \
+          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
+          --build-arg JAVA_RELEASE_ARG=${JAVA_RELEASE:-8} \
           --push mrt-inttest-services/merritt-maven
-      - docker-compose -f mrt-inttest-services/merritt-tomcat/docker-compose.yml build
-      - docker-compose -f mrt-inttest-services/merritt-tomcat/docker-compose.yml push
-      - docker-compose -f mrt-inttest-services/merritt-maven/docker-compose.yml build
-      - docker-compose -f mrt-inttest-services/merritt-maven/docker-compose.yml push
-      - docker-compose -f mrt-inttest-services/mock-merritt-it/docker-compose.yml build
-      - docker-compose -f mrt-inttest-services/mock-merritt-it/docker-compose.yml push
-      - docker-compose -f mrt-inttest-services/mrt-it-database/docker-compose.yml build
-      - docker-compose -f mrt-inttest-services/mrt-it-database/docker-compose.yml push
-      - docker-compose -f mrt-inttest-services/mrt-it-database/docker-compose-audit-replic.yml build
-      - docker-compose -f mrt-inttest-services/mrt-it-database/docker-compose-audit-replic.yml push
-      - docker-compose -f mrt-inttest-services/mrt-minio-it/docker-compose.yml build
-      - docker-compose -f mrt-inttest-services/mrt-minio-it/docker-compose.yml push
-      - docker-compose -f mrt-inttest-services/mrt-minio-it-with-content/docker-compose.yml build
-      - docker-compose -f mrt-inttest-services/mrt-minio-it-with-content/docker-compose.yml push
-      - docker-compose -f mrt-inttest-services/fakesmtp/docker-compose.yml build
-      - docker-compose -f mrt-inttest-services/fakesmtp/docker-compose.yml push
-
-      - docker build --quiet --build-arg ECR_REGISTRY=${ECR_REGISTRY} --no-cache --force-rm -t ${ECR_REGISTRY}/mrt-database mrt-services/mysql
-      - docker push ${ECR_REGISTRY}/mrt-database
-      - docker build --quiet --build-arg ECR_REGISTRY=${ECR_REGISTRY} --no-cache --force-rm -t ${ECR_REGISTRY}/mrt-opendj mrt-services/ldap
-      - docker push ${ECR_REGISTRY}/mrt-opendj
-      - docker build --quiet --build-arg ECR_REGISTRY=${ECR_REGISTRY} --no-cache --force-rm -t ${ECR_REGISTRY}/mrt-init mrt-services/merritt-init
-      - docker push ${ECR_REGISTRY}/mrt-init
-      - docker build --quiet --build-arg ECR_REGISTRY=${ECR_REGISTRY} --no-cache --force-rm -t ${ECR_REGISTRY}/callback mrt-services/callback
-      - docker push ${ECR_REGISTRY}/callback
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/merritt-tomcat:dev \
+          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
+          --push mrt-inttest-services/merritt-tomcat
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/mock-merritt-it:dev \
+          --push mrt-inttest-services/mock-merritt-it
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/mrt-it-database:dev \
+          --push mrt-inttest-services/mrt-it-database
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/mrt-it-database-audit-replic:dev \
+          --build-arg LOAD_SQL=/tmp/audit_replic_data.sql \
+          --push mrt-inttest-services/mrt-it-database
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/mrt-minio-it:dev \
+          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
+          --push mrt-inttest-services/mrt-minio-it
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/mrt-minio-it-with-content:dev \
+          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
+          --push mrt-inttest-services/mrt-minio-it-with-content
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/fakesmtp:dev \
+          --push mrt-inttest-services/fakesmtp
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/mrt-database \
+          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
+          --push mrt-services/mysql
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/mrt-opendj \
+          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
+          --push mrt-services/ldap
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/mrt-init \
+          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
+          --push mrt-services/merritt-init
+      - |
+        docker buildx build --platform linux/arm64,linux/amd64 \
+          -t ${ECR_REGISTRY}/callback \
+          --build-arg ECR_REGISTRY=${ECR_REGISTRY} \
+          --push mrt-services/callback
   post_build:
     commands:
       #- aws s3 rm s3://${S3CFBUCKET}/api --recursive