diff --git a/amplify.yml b/amplify.yml
index a1b8f2a..48fe2ad 100644
--- a/amplify.yml
+++ b/amplify.yml
@@ -10,14 +10,12 @@ frontend:
     build:
       commands:
         - npm run build
+        - cp -r public .next/standalone/
+        - cp -r .next/static .next/standalone/.next/
   artifacts:
-    baseDirectory: ./
+    baseDirectory: .next/standalone
     files:
-      - .next/**/*
-      - node_modules/**/*
-      - package.json
-      - next.config.js
-      - public/**/*
+      - '**/*'
   cache:
     paths:
       - node_modules/**/*
diff --git a/next.config.js b/next.config.js
index a29a5db..61eb67e 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,10 +1,7 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
-  // Ensure server-side features are enabled
-  experimental: {
-    serverActions: true,
-  },
+  output: 'standalone',
 }
 
 module.exports = nextConfig
\ No newline at end of file
diff --git a/terraform/main.tf b/terraform/main.tf
index 631249c..6256870 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -63,6 +63,8 @@ resource "aws_amplify_app" "filamenteka" {
   tags = {
     Name        = "Filamenteka"
     Environment = var.environment
+    # Disable GitHub App migration prompt
+    "amplify:github_app_migration" = "opted_out"
   }
 }