diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 3d57d3dc..b2bfd5fb 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -1,15 +1,15 @@
 name: deploy-changed-apps
 
-on:
-  workflow_dispatch
 # on:
-#   push:
-#     branches:
-#       - master
+#   workflow_dispatch
+on:
+  push:
+    branches:
+      - master
 jobs:
   build_and_deploy:
     runs-on: ubuntu-latest
-    name: Check affected apps
+    name: Build images
     steps:
       - uses: actions/checkout@v4
         with:
@@ -36,10 +36,10 @@ jobs:
           key: npm-dependencies-${{ hashFiles('package.json') }}
       - name: Build base image
         run: npm run docker-base
-      - name: Tag image
+      - name: Tag base image
         run:
-          docker tag sample/my-page \
-          registry.digitalocean.com/my-sample-registry/my-sample-page:${{github.event.inputs.version }}
+          docker tag linkerry/base \
+          registry.digitalocean.com/linkerry/base:latest
       # Install doctl.
       - name: Install doctl
         uses: digitalocean/action-doctl@v2
@@ -47,8 +47,14 @@ jobs:
           token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
       - name: Log in to DO Container Registry
         run: doctl registry login --expiry-seconds 600
-      - run: npx nx@18.3.4 affected -t docker-compose --base=origin/master~1 --head=origin/master
-      - name: Install doctl
-        uses: digitalocean/action-doctl@v2
-        with:
-          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+      - name: Push image to DO Container Registry
+        run: docker push registry.digitalocean.com/linkerry/linkerry/base:latest
+      - name: Build image for web
+        run: docker build -t linkerry/web -f ./apps/web/Dockerfile . --platform=linux/amd64
+      - name: Tag web image
+        run:
+          docker tag linkerry/web \
+          registry.digitalocean.com/linkerry/web:latest
+      - name: Push image to DO Container Registry
+        run: docker push registry.digitalocean.com/linkerry/web:latest
+      # - run: npx nx@18.3.4 affected -t docker-compose --base=origin/master~1 --head=origin/master