diff --git a/.github/workflows/api-gateway-ci-cd.yml b/.github/workflows/api-gateway-ci-cd.yml
new file mode 100644
index 0000000..292dcd8
--- /dev/null
+++ b/.github/workflows/api-gateway-ci-cd.yml
@@ -0,0 +1,65 @@
+name: CI/CD Pipeline for API Gateway
+
+on:
+  workflow_run:
+    workflows: ["CI/CD Pipeline for Eureka Server"]
+    branches: [ "main" ]
+    types:
+      - completed
+
+jobs:
+  test:
+    name: Unit Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Build with Maven
+        run: mvn -B -f apigateway/pom.xml clean install -DskipTests
+
+      - name: Run Tests
+        run: mvn -B -f apigateway/pom.xml test
+
+  build-and-push:
+    name: Build and Push Docker Image
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Build with Maven
+        run: mvn -B -f apigateway/pom.xml clean package
+
+      - name: Dockerize & Push Docker Image
+        uses: mr-smithers-excellent/docker-build-push@v6
+        with:
+          image: noyandocker/springbootmicroserviceswithsecurityapigateway
+          tags: latest
+          registry: docker.io
+          dockerfile: apigateway/Dockerfile
+          directory: apigateway
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.gitignore b/.gitignore
index be758ef..399be60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,7 @@ build/
 .vscode/
 
 ### Environment file
-.env
\ No newline at end of file
+.env
+
+### db folder
+/db