diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 5030795..638ab0d 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -239,39 +239,24 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      # When building images in CI runner
-      - name: Retrieve build output from external workflow
-        if: github.event_name == 'workflow_dispatch'
-        uses: dawidd6/action-download-artifact@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ needs.init.outputs.current-branch }}
-          workflow: ${{ env.CI_WORKFLOW }}
-          name: ${{ env.BUILD_ARTIFACTS }}
-          path: ${{ env.BUILD_FOLDER }}
-          if_no_artifact_found: warn
+      - name: Get Nx apps to build
+        id: build-apps
+        run: |
+          if [[ "${{ github.event_name }}" == "release" ]]; then
+            echo "list=$(yarn get:apps)" >> $GITHUB_OUTPUT
+          else
+            echo "list=$(yarn affected:apps | tr -d ' ')" >> $GITHUB_OUTPUT
+          fi
 
-      - name: Check build outputs presence
-        uses: xSAVIKx/artifact-exists-action@v0
-        id: check-build-artifact
-        with:
-          name: ${{ env.BUILD_ARTIFACTS }}
+      - name: Build apps
+        run: npx nx run-many --target=build --parallel=4 --projects=${{ steps.build-apps.outputs.list }} --verbose
 
-      - name: Retrieve build output from current workflow
-        if: github.event_name != 'workflow_dispatch' && steps.check-build-artifact.outputs.exists == 'true'
-        uses: actions/download-artifact@v4
+      - name: Upload build output
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BUILD_ARTIFACTS }}
           path: ${{ env.BUILD_FOLDER }}
-
-      - name: Check build artifact existence
-        id: check-build
-        uses: andstor/file-existence-action@v2
-        with:
-          files: ${{ env.BUILD_FOLDER }}
-
-      - if: steps.check-build.outputs.files_exists != 'true'
-        run: exit 1
+          retention-days: 5
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -292,7 +277,7 @@ jobs:
           use: true
 
       - name: Run Docker build
-        run: yarn nx run-many --target=docker-build-remote --projects=$(yarn get:apps) --parallel=4 --verbose
+        run: yarn nx run-many --target=docker-build --conf=development --tag=dev --projects=$(yarn get:apps) --parallel=2 --verbose
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 279cf80..ac82be1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -445,23 +445,8 @@ jobs:
 
       - run: npx nx-cloud start-ci-run
 
-      - name: Get Nx apps to build
-        id: build-apps
-        run: |
-          if [[ "${{ github.event_name }}" == "release" ]]; then
-            echo "list=$(yarn get:apps)" >> $GITHUB_OUTPUT
-          else
-            echo "list=$(yarn affected:apps | tr -d ' ')" >> $GITHUB_OUTPUT
-          fi
-
       - name: Run verifications for affected apps
-        uses: jameshenry/parallel-bash-commands@v1
-        with:
-          cmd1: yarn affected:lint --parallel=4 --exclude=workspace --verbose
-          cmd2: yarn affected:test --parallel=4 --exclude=workspace --ci --verbose
-          cmd3: npx nx run-many --target=build --parallel=4 --projects=${{ steps.build-apps.outputs.list }} --verbose
-          # running e2e tests in parallel create conflicts in DB
-          # cmd4: NX_CLOUD_DISTRIBUTED_EXECUTION=false yarn affected:e2e:backend --ci --verbose
+        run: yarn affected -t lint,test,build --parallel=2 --exclude=workspace --ci --verbose
 
       - name: Stop Nx agents
         if: always()
@@ -477,13 +462,6 @@ jobs:
       #     path: .code-pushup
       #     retention-days: 5
 
-      - name: Upload build output
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.BUILD_ARTIFACTS }}
-          path: ${{ env.BUILD_FOLDER }}
-          retention-days: 5
-
       - name: Check libs coverage reports existence
         id: check-libs-coverage
         uses: andstor/file-existence-action@v3
diff --git a/apps/auth/project.json b/apps/auth/project.json
index 6742585..c88d6ce 100644
--- a/apps/auth/project.json
+++ b/apps/auth/project.json
@@ -84,7 +84,7 @@
       "executor": "nx:run-commands",
       "options": {
         "commands": [
-          "node ./tools/deploy/build-docker.js -p auth -c {args.conf} -t {args.tag} -f {args.file}"
+          "node ./tools/deploy/build-docker.js -p auth -c {args.conf} -t {args.tag} -f infra/docker/Dockerfile.backend"
         ],
         "parallel": false
       }
diff --git a/apps/expiration/project.json b/apps/expiration/project.json
index 16ec9d3..5819614 100644
--- a/apps/expiration/project.json
+++ b/apps/expiration/project.json
@@ -76,7 +76,7 @@
       "executor": "nx:run-commands",
       "options": {
         "commands": [
-          "node ./tools/deploy/build-docker.js -p expiration -c {args.conf} -t {args.tag} -f {args.file}"
+          "node ./tools/deploy/build-docker.js -p expiration -c {args.conf} -t {args.tag} -f infra/docker/Dockerfile.backend"
         ],
         "parallel": false
       }
diff --git a/apps/ng-client/project.json b/apps/ng-client/project.json
index f944062..1e946f8 100644
--- a/apps/ng-client/project.json
+++ b/apps/ng-client/project.json
@@ -138,7 +138,7 @@
       "executor": "nx:run-commands",
       "options": {
         "commands": [
-          "node ./tools/deploy/build-docker.js -p 'ng-client' -c {args.conf} -t {args.tag} -f {args.file}"
+          "node ./tools/deploy/build-docker.js -p 'ng-client' -c {args.conf} -t {args.tag} -f infra/docker/Dockerfile.frontend"
         ],
         "parallel": false
       }
diff --git a/apps/orders/project.json b/apps/orders/project.json
index c6939d1..af12490 100644
--- a/apps/orders/project.json
+++ b/apps/orders/project.json
@@ -85,7 +85,7 @@
       "executor": "nx:run-commands",
       "options": {
         "commands": [
-          "node ./tools/deploy/build-docker.js -p orders -c {args.conf} -t {args.tag} -f {args.file}"
+          "node ./tools/deploy/build-docker.js -p orders -c {args.conf} -t {args.tag} -f infra/docker/Dockerfile.backend"
         ],
         "parallel": false
       }
diff --git a/apps/payments/project.json b/apps/payments/project.json
index 081b31b..b479a89 100644
--- a/apps/payments/project.json
+++ b/apps/payments/project.json
@@ -85,7 +85,7 @@
       "executor": "nx:run-commands",
       "options": {
         "commands": [
-          "node ./tools/deploy/build-docker.js -p payments -c {args.conf} -t {args.tag} -f {args.file}"
+          "node ./tools/deploy/build-docker.js -p payments -c {args.conf} -t {args.tag} -f infra/docker/Dockerfile.backend"
         ],
         "parallel": false
       }
diff --git a/apps/tickets/project.json b/apps/tickets/project.json
index a146497..69cd21e 100644
--- a/apps/tickets/project.json
+++ b/apps/tickets/project.json
@@ -85,7 +85,7 @@
       "executor": "nx:run-commands",
       "options": {
         "commands": [
-          "node ./tools/deploy/build-docker.js -p tickets -c {args.conf} -t {args.tag} -f {args.file}"
+          "node ./tools/deploy/build-docker.js -p tickets -c {args.conf} -t {args.tag} -f infra/docker/Dockerfile.backend"
         ],
         "parallel": false
       }