diff --git a/.gitea/workflows/main-api.yaml b/.gitea/workflows/deploy-api-prod.yaml
similarity index 100%
rename from .gitea/workflows/main-api.yaml
rename to .gitea/workflows/deploy-api-prod.yaml
diff --git a/.gitea/workflows/main-etl.yaml b/.gitea/workflows/deploy-etl-prod.yaml
similarity index 100%
rename from .gitea/workflows/main-etl.yaml
rename to .gitea/workflows/deploy-etl-prod.yaml
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
new file mode 100644
index 0000000..9e4fb95
--- /dev/null
+++ b/.gitea/workflows/main.yaml
@@ -0,0 +1,33 @@
+name: API and ETL Build
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build_etl:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+
+      - name: Build ETL Image
+        run: |
+          docker build \
+            -f OpenCand.ETL.dockerfile \
+            .
+        
+  build_api:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+
+      - name: Build API Image
+        run: |
+          docker build \
+            -f OpenCand.API.dockerfile \
+            .