diff --git a/.github/workflows/test.yaml b/.github/workflows/ci.yaml
similarity index 56%
rename from .github/workflows/test.yaml
rename to .github/workflows/ci.yaml
index 434d4af..ab8256c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,5 +1,7 @@
-name: Test
+name: CI
 on:
+  push:
+    branches: ["main"]
   pull_request:
 env:
   REGISTRY: ghcr.io
@@ -76,3 +78,54 @@ jobs:
           cd relayer_engine
           npm ci
           npx tsc --noEmit --project tsconfig.json
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout trustless-generic-relayer
+        uses: actions/checkout@v3
+      - name: Checkout wormhole
+        uses: actions/checkout@v3
+        with:
+          repository: wormhole-foundation/wormhole
+          path: ethereum/wormhole
+          ref: feat/batch_vaa_alternative
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: "npm"
+          cache-dependency-path: |
+            ethereum/package-lock.json
+            ethereum/wormhole/ethereum/package-lock.json
+            relayer_engine/package-lock.json
+            sdk/package-lock.json
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+      - name: Generate contract typechain typings
+        run: |
+          cd ethereum
+          make build
+      - name: Install relayer engine dependencies
+        run: |
+          cd relayer_engine
+          npm ci
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: relayer_engine
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/docker-push-main.yaml b/.github/workflows/docker-push-main.yaml
deleted file mode 100644
index 3460d42..0000000
--- a/.github/workflows/docker-push-main.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-name: Create and publish a Docker image
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build-and-push-image:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout trustless-generic-relayer
-        uses: actions/checkout@v3
-      - name: Checkout wormhole
-        uses: actions/checkout@v3
-        with:
-          repository: wormhole-foundation/wormhole
-          path: ethereum/wormhole
-          ref: feat/batch_vaa_alternative
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: "npm"
-          cache-dependency-path: |
-            ethereum/package-lock.json
-            ethereum/wormhole/ethereum/package-lock.json
-            relayer_engine/package-lock.json
-            sdk/package-lock.json
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-      - name: Generate contract typechain typings
-        run: |
-          cd ethereum
-          make build
-      - name: Install relayer engine dependencies
-        run: |
-          cd relayer_engine
-          npm ci
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
-        with:
-          context: relayer_engine
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}