diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5968875..43bf3c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI/CD Pipeline
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "master" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "master" ]
 
 jobs:
   build-and-test:
@@ -16,13 +16,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build Docker Compose Services
-        run: docker-compose build
+      - name: Build Docker Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: false
+          tags: todo2-app:ci
 
-      - name: Start Services (Dry Run)
-        run: docker-compose up -d
-
-      - name: Check Running Containers
-        run: docker ps
-        
       # TODO: Add your custom deployment step here dependent on where you host (e.g., SSH, Render Deploy Hook, etc.)
diff --git a/docker-compose.yml b/docker-compose.yml
index a61c861..e91282b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - env_todo2/.env
     volumes:
       - .:/app # Optional: for hot reloading if you run uvicorn inside docker with --reload
-      - ~/AppData/Roaming/gcloud/application_default_credentials.json:/tmp/keys/application_default_credentials.json:ro
+      - ~/.config/gcloud/application_default_credentials.json:/tmp/keys/application_default_credentials.json:ro
 
   db:
     image: postgres:15-alpine
@@ -26,7 +26,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U ritz -d todo2_db" ]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 5s
       timeout: 5s
       retries: 5