diff --git a/.gitea/workflows/ci-cd-with-gitea-vars.yml b/.gitea/workflows/ci-cd-with-gitea-vars.yml
index d78275d..0f8226f 100644
--- a/.gitea/workflows/ci-cd-with-gitea-vars.yml
+++ b/.gitea/workflows/ci-cd-with-gitea-vars.yml
@@ -96,18 +96,6 @@ jobs:
         run: |
           echo "🚀 Deploying using Gitea Variables and Secrets..."
           
-          # Export environment variables from Gitea
-          export NODE_ENV="${{ vars.NODE_ENV }}"
-          export LOG_LEVEL="${{ vars.LOG_LEVEL }}"
-          export NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}"
-          export NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}"
-          export NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}"
-          export MY_EMAIL="${{ vars.MY_EMAIL }}"
-          export MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}"
-          export MY_PASSWORD="${{ secrets.MY_PASSWORD }}"
-          export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
-          export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
-          
           echo "📝 Using Gitea Variables and Secrets:"
           echo "  - NODE_ENV: ${NODE_ENV}"
           echo "  - LOG_LEVEL: ${LOG_LEVEL}"
@@ -130,6 +118,14 @@ jobs:
           echo "🚀 Starting new containers..."
           docker compose up -d
           
+          # Wait a moment for containers to start
+          echo "⏳ Waiting for containers to start..."
+          sleep 10
+          
+          # Check container logs for debugging
+          echo "📋 Container logs (first 20 lines):"
+          docker compose logs --tail=20
+          
           echo "✅ Deployment completed!"
         env:
           NODE_ENV: ${{ vars.NODE_ENV }}
diff --git a/docker-compose.yml b/docker-compose.yml
index 108db5a..158e444 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,12 +12,12 @@ services:
       - NODE_ENV=${NODE_ENV:-production}
       - DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public
       - REDIS_URL=redis://redis:6379
-      - NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL}
-      - MY_EMAIL=${MY_EMAIL}
-      - MY_INFO_EMAIL=${MY_INFO_EMAIL}
-      - MY_PASSWORD=${MY_PASSWORD}
-      - MY_INFO_PASSWORD=${MY_INFO_PASSWORD}
-      - ADMIN_BASIC_AUTH=${ADMIN_BASIC_AUTH}
+      - NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL:-https://dk0.dev}
+      - MY_EMAIL=${MY_EMAIL:-contact@dk0.dev}
+      - MY_INFO_EMAIL=${MY_INFO_EMAIL:-info@dk0.dev}
+      - MY_PASSWORD=${MY_PASSWORD:-your-email-password}
+      - MY_INFO_PASSWORD=${MY_INFO_PASSWORD:-your-info-email-password}
+      - ADMIN_BASIC_AUTH=${ADMIN_BASIC_AUTH:-admin:your_secure_password_here}
     volumes:
       - portfolio_data:/app/.next/cache
     networks: