diff --git a/.github/workflows/cd-staging-tagged.yml b/.github/workflows/cd-staging-tagged.yml
index 0f7db0fb5..88b0a54ae 100644
--- a/.github/workflows/cd-staging-tagged.yml
+++ b/.github/workflows/cd-staging-tagged.yml
@@ -140,7 +140,7 @@ jobs:
                   web)
                     # Apps with their own Dockerfiles (need monorepo root for shared packages)
                     case "$PROJECT" in
-                      manacore|todo|calendar|clock)
+                      manacore|todo|calendar)
                         DOCKERFILE_PATH="apps/$PROJECT/apps/web/Dockerfile"
                         CONTEXT_PATH="."
                         ;;
@@ -174,7 +174,6 @@ jobs:
                     manacore) PORT="5173" ;;
                     todo) PORT="5188" ;;
                     calendar) PORT="5186" ;;
-                    clock) PORT="5187" ;;
                     *) PORT="5173" ;;  # default SvelteKit port
                   esac
                 fi
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index 64a4ae52e..0da7b0275 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -29,8 +29,6 @@ on:
           - todo-web
           - calendar-backend
           - calendar-web
-          - clock-backend
-          - clock-web
           - picture-backend
           - picture-web
   workflow_call:
@@ -220,9 +218,6 @@ jobs:
             # Create calendar database (for calendar-backend service)
             docker compose exec -T postgres psql -U postgres -c "CREATE DATABASE calendar;" 2>/dev/null || echo "calendar database already exists"
 
-            # Create clock database (for clock-backend service)
-            docker compose exec -T postgres psql -U postgres -c "CREATE DATABASE clock;" 2>/dev/null || echo "clock database already exists"
-
             # Create picture database (for picture-backend service)
             docker compose exec -T postgres psql -U postgres -c "CREATE DATABASE picture;" 2>/dev/null || echo "picture database already exists"
 
@@ -361,8 +356,6 @@ jobs:
             check_health todo-web http://localhost:5188/health || exit 1
             check_health calendar-backend http://localhost:3016/api/v1/health || exit 1
             check_health calendar-web http://localhost:5186/health || exit 1
-            check_health clock-backend http://localhost:3017/api/v1/health || exit 1
-            check_health clock-web http://localhost:5187/health || exit 1
             check_health picture-backend http://localhost:3006/api/v1/health || exit 1
             check_health picture-web http://localhost:5175/health || exit 1
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c2719bcb..82037fe57 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,8 +78,6 @@ jobs:
           - { name: 'todo-web', path: 'apps/todo/apps/web', port: '5188' }
           - { name: 'calendar-backend', path: 'apps/calendar/apps/backend', port: '3016' }
           - { name: 'calendar-web', path: 'apps/calendar/apps/web', port: '5186' }
-          - { name: 'clock-backend', path: 'apps/clock/apps/backend', port: '3017' }
-          - { name: 'clock-web', path: 'apps/clock/apps/web', port: '5187' }
           - { name: 'picture-backend', path: 'apps/picture/apps/backend', port: '3006' }
           - { name: 'picture-web', path: 'apps/picture/apps/web', port: '5175' }
       fail-fast: false
diff --git a/apps/todo/apps/backend/Dockerfile b/apps/todo/apps/backend/Dockerfile
index 9f3fcc3cb..b8a6e1cd1 100644
--- a/apps/todo/apps/backend/Dockerfile
+++ b/apps/todo/apps/backend/Dockerfile
@@ -12,15 +12,10 @@ COPY package.json ./
 COPY pnpm-lock.yaml ./
 
 # Copy shared packages (core packages for NestJS backends)
-COPY packages/shared-errors ./packages/shared-errors
 COPY packages/better-auth-types ./packages/better-auth-types
 COPY packages/shared-nestjs-auth ./packages/shared-nestjs-auth
 COPY packages/shared-nestjs-cors ./packages/shared-nestjs-cors
 
-# Copy build script
-COPY docker/shared/build-shared-packages.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/build-shared-packages.sh
-
 # Copy todo shared package and backend
 COPY apps/todo/packages/shared ./apps/todo/packages/shared
 COPY apps/todo/apps/backend ./apps/todo/apps/backend
@@ -29,10 +24,13 @@ COPY apps/todo/apps/backend ./apps/todo/apps/backend
 RUN pnpm install --frozen-lockfile
 
 # Build shared packages in dependency order
-RUN build-shared-packages.sh
+WORKDIR /app/packages/better-auth-types
+RUN pnpm build
 
-# Build todo shared package
-WORKDIR /app/apps/todo/packages/shared
+WORKDIR /app/packages/shared-nestjs-auth
+RUN pnpm build
+
+WORKDIR /app/packages/shared-nestjs-cors
 RUN pnpm build
 
 # Build the backend