diff --git a/client/Dockerfile.prod b/client/Dockerfile.prod
index 9d34ac6c..aac2814c 100644
--- a/client/Dockerfile.prod
+++ b/client/Dockerfile.prod
@@ -33,6 +33,8 @@ COPY --from=build --chown=nextjs:nodejs /app/client/.next ./.next
 COPY --from=build --chown=nextjs:nodejs /app/client/entrypoint.sh ./entrypoint.sh
 COPY --from=build /app/node_modules ./node_modules
 COPY --from=build /app/client/package.json ./package.json
+COPY --from=build /app/client/public ./public
+COPY --from=build /app/client/next.config.mjs ./next.config.mjs
 
 USER nextjs
 
diff --git a/client/next.config.mjs b/client/next.config.mjs
index 28e221dc..595b3aac 100644
--- a/client/next.config.mjs
+++ b/client/next.config.mjs
@@ -4,12 +4,19 @@ import('./src/env.mjs');
 const nextConfig = {
   transpilePackages: ['@serverless-app-scaffold/types', 'lucide-react', 'hi'],
   images: {
-    domains: ['api.mapbox.com', 'afoco-staging-assets.s3.ap-northeast-2.amazonaws.com'],
     remotePatterns: [
       {
         protocol: 'https',
         hostname: 'climation-staging.afocosec.org',
       },
+      {
+        protocol: 'https',
+        hostname: 'afoco-staging-assets.s3.ap-northeast-2.amazonaws.com',
+      },
+      {
+        protocol: 'https',
+        hostname: 'afoco-production-assets.s3.ap-northeast-2.amazonaws.com',
+      },
     ],
   },
   async redirects() {
diff --git a/infrastructure/base/main.tf b/infrastructure/base/main.tf
index 0a2f0741..b2049382 100644
--- a/infrastructure/base/main.tf
+++ b/infrastructure/base/main.tf
@@ -105,5 +105,5 @@ module "production" {
   pipeline_user_access_key_id     = module.iam.pipeline_user_access_key_id
   pipeline_user_access_key_secret = module.iam.pipeline_user_access_key_secret
   node_env                        = "production"
-  cert_validated                  = false
+  cert_validated                  = true
 }