diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..e69de29b
diff --git a/courses/README.md b/courses/README.md
index 849a02e5..fd20b486 100644
--- a/courses/README.md
+++ b/courses/README.md
@@ -11,3 +11,5 @@ It's important to note that this documentation lists all of the courses that we
 ## [Frontend](/courses/frontend/README.md)
 
 ## [Backend](/courses/backend/README.md)
+
+## [Cloud & AI](/courses/cloud&ai/README.md)
diff --git a/courses/cloud&ai/README.md b/courses/cloud&ai/README.md
new file mode 100644
index 00000000..54e9a8d0
--- /dev/null
+++ b/courses/cloud&ai/README.md
@@ -0,0 +1,30 @@
+# Cloud & AI
+
+This specialization course focuses on cloud computing and artificial intelligence using Amazon Web Services (AWS), preparing trainees for modern cloud-native development and AI-powered applications.
+
+## Learning Goals
+
+By the end of this course, trainees will be able to:
+
+- Deploy and manage applications in AWS cloud
+- Work with AI/ML services and APIs on AWS
+- Build cloud-native applications on AWS
+- Implement AI-powered features in existing applications
+
+## Modules
+
+| Name                                                                    | Weeks |
+| ----------------------------------------------------------------------- | ----- |
+| [AWS Fundamentals](./aws-fundamentals/README.md)                        | 2     |
+| [Database & Storage Services](./database-storage-services/README.md)    | 2     |
+| [Building 3 Tier Web Apps on AWS](./building-3-tier-web-apps/README.md) | 1     |
+| [Serverless on AWS](./serverless-aws/README.md)                         | 2     |
+| [AI/ML Services](./ai-ml-services/README.md)                            | 2     |
+| [Build AI/ML Applications](./build-ai-ml-applications/README.md)        | 2     |
+| [Final project](./final-project/README.md)                              | 4     |
+
+Total: 15 weeks
+
+## Prerequisites
+
+Trainees should have completed the [Foundation course](../foundation/README.md) before starting this specialization.
diff --git a/courses/cloud&ai/ai-ml-services/README.md b/courses/cloud&ai/ai-ml-services/README.md
new file mode 100644
index 00000000..b3030835
--- /dev/null
+++ b/courses/cloud&ai/ai-ml-services/README.md
@@ -0,0 +1,10 @@
+# AI/ML Services
+
+This module covers AWS artificial intelligence and machine learning services, teaching trainees to integrate AI capabilities into their applications.
+
+## Machine Learning
+
+| Week | Topic                                                        |
+| ---- | ------------------------------------------------------------ |
+| 1.   | [Introduction to Machine Learning on AWS](./week1/README.md) |
+| 2.   | [Machine Learning Workshop](./week2/README.md)               |
diff --git a/courses/cloud&ai/ai-ml-services/week1/README.md b/courses/cloud&ai/ai-ml-services/week1/README.md
new file mode 100644
index 00000000..449c5a2a
--- /dev/null
+++ b/courses/cloud&ai/ai-ml-services/week1/README.md
@@ -0,0 +1,18 @@
+# AI/ML Services (Week 1)
+
+This module covers AWS artificial intelligence and machine learning services, teaching trainees to utilize AI/ML services on AWS to build applications.
+
+## Machine Learning
+
+| Week | Topic                            | Content                                                                                                                                                                                 | Description                                   |
+| ---- | -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- |
+| 1.   | Introduction to Machine Learning | [Introduction to Machine Learning - Art of the Possible](https://skillbuilder.aws/learn/W5U4ZWMGAH/introduction-to-machine-learning-art-of-the-possible/YSW8SJ3N3Q?parentId=2PW43AVTYR) | Overview of ML possibilities and applications |
+| 1.   | ML Terminologies and Concepts    | [Machine Learning Terminology and Process](https://skillbuilder.aws/learn/8U8G8MKUEK/machine-learning-terminology-and-process/DMCV9X9A2V?parentId=2PW43AVTYR)                           | Essential ML vocabulary and processes         |
+| 1.   | AI/ML Fundamentals               | [Fundamentals of Machine Learning and Artificial Intelligence](https://skillbuilder.aws/learn/16ASDUHF86/fundamentals-of-machine-learning-and-artificial-intelligence/M7JZCTA94N)       | Core concepts of AI and ML                    |
+| 1.   | Amazon SageMaker                 | [Introduction to Amazon SageMaker](https://skillbuilder.aws/learn/E1TZFJG8AG/introduction-to-amazon-sagemaker/GK2ESQYCR3?parentId=2PW43AVTYR)                                           | AWS managed ML platform introduction          |
+
+## Learning goals
+
+- [ ] Understand machine learning fundamentals and terminology
+- [ ] Learn AI/ML concepts and processes
+- [ ] Work with Amazon SageMaker for ML model development
diff --git a/courses/cloud&ai/ai-ml-services/week2/README.md b/courses/cloud&ai/ai-ml-services/week2/README.md
new file mode 100644
index 00000000..68b4002d
--- /dev/null
+++ b/courses/cloud&ai/ai-ml-services/week2/README.md
@@ -0,0 +1,18 @@
+# AI/ML Services (Week 2)
+
+This module allows trainees to have hands-on experience building generative ai applications on AWS
+
+## Machine Learning
+
+| Week | Topic    | Content                                                                    | Description                                               |
+| ---- | -------- | -------------------------------------------------------------------------- | --------------------------------------------------------- |
+| 2.   | Workshop | [Building Gen AI Apps](https://catalog.workshops.aws/building-gen-ai-apps) | Hands-on workshop for building generative AI applications |
+
+## Learning goals
+
+- [ ] Work with Amazon SageMaker for ML model development
+- [ ] Build generative AI applications using AWS services
+
+## Prerequisites
+
+Trainees should have completed the [AI/ML Services Week1](../week1/README.md) before starting this module.
diff --git a/courses/cloud&ai/aws-fundamentals/README.md b/courses/cloud&ai/aws-fundamentals/README.md
new file mode 100644
index 00000000..c85198a1
--- /dev/null
+++ b/courses/cloud&ai/aws-fundamentals/README.md
@@ -0,0 +1,8 @@
+# AWS Fundamentals (IAM, Compute & Networking)
+
+This module introduces trainees to Amazon Web Services fundamentals.
+
+| Week | Topic                                         |
+| ---- | --------------------------------------------- |
+| 1.   | [Getting started with AWS](./week1/README.md) |
+| 2.   | [Deep Dive and Workshop](./week2/README.md)   |
diff --git a/courses/cloud&ai/aws-fundamentals/week1/README.md b/courses/cloud&ai/aws-fundamentals/week1/README.md
new file mode 100644
index 00000000..9e78d610
--- /dev/null
+++ b/courses/cloud&ai/aws-fundamentals/week1/README.md
@@ -0,0 +1,15 @@
+# AWS Fundamentals (IAM, Compute & Networking) (Week 1)
+
+This module introduces trainees to Amazon Web Services fundamentals, focusing on Identity and Access Management, compute services, and networking concepts.
+
+| Week | Topic                         | Content                                                                                                                         | Description                                      |
+| ---- | ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------ |
+| 1.   | Setting up an account and IAM | [AWS Account Setup Learning Plan](https://skillbuilder.aws/learning-plan/4YT74952PX/aws-account-setup-learning-plan/M75G5W23MV) | Learn to set up AWS account and IAM fundamentals |
+| 1.   | Compute on AWS                | [AWS Compute Services Overview](https://skillbuilder.aws/learn/QV37EUK5Y7/aws-compute-services-overview/EG41UCZ2T3)             | Introduction to AWS compute services             |
+| 1.   | Networking Basics on AWS      | [AWS Networking Basics](https://skillbuilder.aws/learn/S1VYRYHD8V/aws-networking-basics/SKP7248UVF)                             | Fundamentals of AWS networking                   |
+
+## Learning goals
+
+- [ ] Set up AWS account and understand IAM fundamentals
+- [ ] Understand AWS compute services and EC2 basics
+- [ ] Learn AWS networking fundamentals and VPC concepts
diff --git a/courses/cloud&ai/aws-fundamentals/week2/README.md b/courses/cloud&ai/aws-fundamentals/week2/README.md
new file mode 100644
index 00000000..be582901
--- /dev/null
+++ b/courses/cloud&ai/aws-fundamentals/week2/README.md
@@ -0,0 +1,18 @@
+# AWS Fundamentals (IAM, Compute & Networking) (Week 2)
+
+This module allows trainees to dive deep on compute and networking for Amazon Web Services in addition to hands-on walkthrough of fundamentals of AWS.
+
+| Week | Topic                    | Content                                                                                                                             | Description                                          |
+| ---- | ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------- |
+| 2.   | VPC Deep Dive (Optional) | [Introduction to Amazon VPC](https://skillbuilder.aws/learn/PH6Z6EVH8Z/introduction-to-amazon-virtual-private-cloud-vpc/PA8H7FUE15) | Deep dive into Virtual Private Cloud concepts        |
+| 2.   | EC2 Deep Dive (Optional) | [Introduction to Amazon EC2](https://skillbuilder.aws/learn/9VNGAHHAUU/introduction-to-amazon-ec2/AJZEJRN2BQ)                       | Deep dive into Elastic Compute Cloud                 |
+| 2.   | Workshop                 | [General Immersion Day](https://catalog.workshops.aws/general-immersionday/en-US)                                                   | Hands-on workshop covering IAM, Compute & Networking |
+
+## Learning goals
+
+- [ ] Learn AWS fundamentals and concepts
+- [ ] Apply knowledge through hands-on workshop exercises
+
+## Prerequisites
+
+Trainees should have completed the [AWS Fundamentals Week1](../week1/README.md) before starting this module.
diff --git a/courses/cloud&ai/build-ai-ml-applications/README.md b/courses/cloud&ai/build-ai-ml-applications/README.md
new file mode 100644
index 00000000..a233317d
--- /dev/null
+++ b/courses/cloud&ai/build-ai-ml-applications/README.md
@@ -0,0 +1,10 @@
+# Build AI/ML Applications
+
+This module focuses on building complete AI/ML applications using AWS services, with emphasis on Generative AI and Agentic AI solutions.
+
+## Generative AI
+
+| Week | Topic                                               |
+| ---- | --------------------------------------------------- |
+| 1.   | [Generative AI on AWS](./week1/README.md)           |
+| 2.   | [Agentic AI on AWS and Workshop](./week2/README.md) |
diff --git a/courses/cloud&ai/build-ai-ml-applications/week1/README.md b/courses/cloud&ai/build-ai-ml-applications/week1/README.md
new file mode 100644
index 00000000..7a6e65cd
--- /dev/null
+++ b/courses/cloud&ai/build-ai-ml-applications/week1/README.md
@@ -0,0 +1,17 @@
+# Build AI/ML Applications (Week 1)
+
+This module focuses on building complete AI/ML applications using AWS services, with emphasis on Generative AI.
+
+## Generative AI
+
+| Week | Topic                          | Content                                                                                                                                            | Description                                     |
+| ---- | ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- |
+| 1.   | Introduction to Generative AI  | [Fundamentals of Generative AI](https://skillbuilder.aws/learn/FKXM21R555/fundamentals-of-generative-ai/ZFX96NREH4)                                | Core concepts and applications of generative AI |
+| 1.   | Amazon Bedrock                 | [Amazon Bedrock Getting Started](https://skillbuilder.aws/learn/63KTRM86DQ/amazon-bedrock-getting-started/SC2Y3HMAUE)                              | AWS managed service for foundation models       |
+| 1.   | Generative AI Solutions on AWS | [Developing Generative AI Solutions](https://skillbuilder.aws/learn/PWJCMNXWHT/developing-generative-artificial-intelligence-solutions/JFB95SXNPF) | Building complete GenAI solutions               |
+
+## Learning goals
+
+- [ ] Understand Generative AI fundamentals and applications
+- [ ] Work with Amazon Bedrock for generative AI solutions
+- [ ] Understand how to develop generative AI applications on AWS
diff --git a/courses/cloud&ai/build-ai-ml-applications/week2/README.md b/courses/cloud&ai/build-ai-ml-applications/week2/README.md
new file mode 100644
index 00000000..ee7b8e40
--- /dev/null
+++ b/courses/cloud&ai/build-ai-ml-applications/week2/README.md
@@ -0,0 +1,20 @@
+# Build AI/ML Applications (Week 2)
+
+This module focuses on building complete AI/ML applications using AWS services, with emphasis Agentic AI solutions.
+
+## Agentic AI
+
+| Week | Topic                             | Content                                                                                                                                | Description                                    |
+| ---- | --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------- |
+| 2.   | Introduction to Agentic AI on AWS | [Introduction to Agentic AI on AWS](https://skillbuilder.aws/learn/DNBD5MT8ZD/introduction-to-agentic-ai-on-aws/WAKAFK6UFY)            | AI agents and autonomous systems               |
+| 2.   | Workshop                          | [Building AI Applications Workshop](https://catalog.us-east-1.prod.workshops.aws/workshops/d829683a-bb19-4275-a6d0-e7d4195bb8fe/en-US) | Hands-on workshop for complete AI applications |
+
+## Learning goals
+
+- [ ] Develop generative AI applications on AWS
+- [ ] Learn about Agentic AI concepts and implementation
+- [ ] Build complete AI-powered applications
+
+## Prerequisites
+
+Trainees should have completed the [Build AI/ML Applications Week1](../week1/README.md) before starting this module.
diff --git a/courses/cloud&ai/building-3-tier-web-apps/README.md b/courses/cloud&ai/building-3-tier-web-apps/README.md
new file mode 100644
index 00000000..41be99e2
--- /dev/null
+++ b/courses/cloud&ai/building-3-tier-web-apps/README.md
@@ -0,0 +1,7 @@
+# Building Highly Available Web Applications on AWS
+
+This module teaches trainees how to build scalable 3-tier web applications using AWS services, covering presentation, application, and data layers.
+
+| Week | Topic                                                  |
+| ---- | ------------------------------------------------------ |
+| 1.   | [Highly available web applications](./week1/README.md) |
diff --git a/courses/cloud&ai/building-3-tier-web-apps/week1/README.md b/courses/cloud&ai/building-3-tier-web-apps/week1/README.md
new file mode 100644
index 00000000..63da4dfd
--- /dev/null
+++ b/courses/cloud&ai/building-3-tier-web-apps/week1/README.md
@@ -0,0 +1,15 @@
+# Building Highly Available Web Applications on AWS (Week 1)
+
+This module is a hands on workshop allowing trainees bring together learnings from the previous modules to build scalable 3-tier web applications using AWS services, covering presentation, application, and data layers.
+
+| Week | Topic                             | Content                                                                                                                                                   | Description                                            |
+| ---- | --------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------ |
+| 1.   | Building 3-tier web applications  | [Workshop](https://catalog.us-east-1.prod.workshops.aws/workshops/869a0a06-1f98-4e19-b5ac-cbb1abdfc041/en-US)                                             | Hands-on workshop for building 3-tier web applications |
+| 1.   | Highly available web applications | [AWS Simulearn - Highly Available Web Applications](https://skillbuilder.aws/learn/MSNJKZ17FF/aws-simulearn-highly-available-web-applications/7MVYAZPHY4) | Learn high availability patterns and implementation    |
+
+## Learning goals
+
+- [ ] Understand 3-tier architecture patterns
+- [ ] Build scalable web applications on AWS
+- [ ] Implement high availability and fault tolerance
+- [ ] Apply best practices for web application deployment
diff --git a/courses/cloud&ai/database-storage-services/README.md b/courses/cloud&ai/database-storage-services/README.md
new file mode 100644
index 00000000..6301f06c
--- /dev/null
+++ b/courses/cloud&ai/database-storage-services/README.md
@@ -0,0 +1,8 @@
+# Database & Storage Services
+
+This module covers AWS database and storage services, teaching trainees how to work with various data storage solutions in the cloud.
+
+| Week | Topic                                                             |
+| ---- | ----------------------------------------------------------------- |
+| 1.   | [Introduction to Storage and Databases on AWS](./week1/README.md) |
+| 2.   | [Storage and Databases Workshop on AWS](./week2/README.md)        |
diff --git a/courses/cloud&ai/database-storage-services/week1/README.md b/courses/cloud&ai/database-storage-services/week1/README.md
new file mode 100644
index 00000000..d9bc343a
--- /dev/null
+++ b/courses/cloud&ai/database-storage-services/week1/README.md
@@ -0,0 +1,14 @@
+# Database & Storage Services (Week 1)
+
+This module covers AWS database and storage services.
+
+| Week | Topic                               | Content                                                                                                                                         | Description                          |
+| ---- | ----------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------ |
+| 1.   | Getting started with storage on AWS | [Getting Started with AWS Storage](https://skillbuilder.aws/learn/WQTG8AM8XJ/getting-started-with-aws-storage/8TFAVSP8TE)                       | Introduction to AWS storage services |
+| 1.   | Introduction to Databases           | [Introduction to Building with AWS Databases](https://skillbuilder.aws/learn/HYKKWEN9ZS/introduction-to-building-with-aws-databases/V7RVH2KY91) | Database fundamentals on AWS         |
+
+## Learning goals
+
+- [ ] Understand AWS storage services and S3 fundamentals
+- [ ] Learn database concepts and AWS database services
+- [ ] Work with RDS for PostgreSQL and MySQL
diff --git a/courses/cloud&ai/database-storage-services/week2/README.md b/courses/cloud&ai/database-storage-services/week2/README.md
new file mode 100644
index 00000000..96b564eb
--- /dev/null
+++ b/courses/cloud&ai/database-storage-services/week2/README.md
@@ -0,0 +1,19 @@
+# Database & Storage Services (Week 2)
+
+This module covers optional deep dive AWS database and storage learnings, and a workshop for hands-on-learning.
+
+| Week | Topic                         | Content                                                                                                                                     | Description                                                    |
+| ---- | ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------- |
+| 2.   | S3 Deep Dive (Optional)       | [Introduction to Amazon S3](https://skillbuilder.aws/learn/R54NZHEX5K/introduction-to-amazon-simple-storage-service-s3/SKTY8SPYDX)          | Deep dive into Simple Storage Service                          |
+| 2.   | RDS for PostgreSQL (Optional) | [Fundamentals of Amazon RDS for PostgreSQL](https://skillbuilder.aws/learn/AK479CRG5K/fundamentals-of-amazon-rds-for-postgresql/FB4ZR9N2DU) | PostgreSQL on RDS fundamentals                                 |
+| 2.   | RDS for MySQL (Optional)      | [Amazon RDS for MySQL Getting Started](https://skillbuilder.aws/learn/YV5RHEG365/amazon-rds-for-mysql-getting-started/HN22D6JSXV)           | MySQL on RDS getting started                                   |
+| 2.   | Workshop                      | [General Immersion Day](https://catalog.workshops.aws/general-immersionday/en-US)                                                           | Hands-on workshop covering Storage, Databases & CloudFormation |
+
+## Learning goals
+
+- [ ] Work with RDS for PostgreSQL and MySQL
+- [ ] Apply knowledge through hands-on workshop
+
+## Prerequisites
+
+Trainees should have completed the [Storage & Databases on AWS Week1](../week1/README.md) before starting this deep dive lessons and workshop.
diff --git a/courses/cloud&ai/final-project/README.md b/courses/cloud&ai/final-project/README.md
new file mode 100644
index 00000000..e8422baf
--- /dev/null
+++ b/courses/cloud&ai/final-project/README.md
@@ -0,0 +1,57 @@
+# Final Project
+
+The capstone project for the Cloud & AI specialization consists of two required projects that demonstrate mastery of cloud deployment and AI/ML integration using AWS services.
+
+## Project Requirements
+
+Trainees must complete **BOTH** of the following projects:
+
+| Week   | Projects                          |
+| ------ | --------------------------------- |
+| 1 & 2. | [Project 1](./project1/README.md) |
+| 3 & 4. | [Project 2](./project2/README.md) |
+
+## Technical Requirements (Both Projects)
+
+### AWS Services Integration
+
+- Must use at least 3 different AWS services appropriately
+- Implement proper IAM roles and security practices
+- Follow AWS Well-Architected Framework principles
+
+### Architecture Documentation
+
+- Solution architecture diagrams (use tools like draw.io, Lucidchart, or AWS Architecture Icons)
+- Security and scalability considerations
+
+### Deployment & Demo
+
+- Application must be publicly accessible (with appropriate security)
+- Live demonstration during final presentations
+- Document deployment process
+
+## Evaluation Criteria
+
+### Technical Implementation (40%)
+
+- Proper use of AWS services
+- Security implementation
+- Scalability considerations
+
+### Architecture & Documentation (20%)
+
+- Accurate architecture diagrams
+- Well-reasoned technology choices
+- Understanding of trade-offs
+
+### Demonstration & Presentation (20%)
+
+- Live demo functionality
+- Clear explanation of technical decisions
+- Ability to answer technical questions
+
+### Innovation & Complexity (20%)
+
+- Appropriate technical complexity
+- Use of advanced features
+- Going beyond minimum requirements
diff --git a/courses/cloud&ai/final-project/project1/README.md b/courses/cloud&ai/final-project/project1/README.md
new file mode 100644
index 00000000..59c51588
--- /dev/null
+++ b/courses/cloud&ai/final-project/project1/README.md
@@ -0,0 +1,25 @@
+# Project 1: Building Cloud Infrastracture & Application Deployment
+
+**Objective:** Build and/or deploy an existing application to AWS with proper cloud architecture
+
+**Requirements:**
+
+- Take an existing web application (from previous courses or personal projects)
+- Design and implement a cloud architecture using AWS services
+- Deploy the application following WAF best practices
+- Document the architecture with diagrams
+- Provide a live demo of the application running on AWS
+
+**Deliverables:**
+
+1. **Architecture Documentation** - Architecture diagrams
+2. **Deployed Application** - Live application accessible via AWS
+3. **Demo Presentation** - 5-10 minute demonstration of the running application and infrastracture
+
+## Project 1 - Cloud Projects Examples
+
+- E-commerce platform with database and file storage
+- Social media application with user authentication
+- Task management system with real-time features
+- Portfolio website with CMS capabilities
+- API-driven mobile app backend
diff --git a/courses/cloud&ai/final-project/project2/README.md b/courses/cloud&ai/final-project/project2/README.md
new file mode 100644
index 00000000..ef5d1a99
--- /dev/null
+++ b/courses/cloud&ai/final-project/project2/README.md
@@ -0,0 +1,26 @@
+# Project 2: AI-Powered Application with RAG/Agentic Capabilities
+
+**Objective:** Build and deploy an AI-powered application using modern AI techniques
+
+**Requirements:**
+
+- Build an application incorporating RAG (Retrieval Augmented Generation) or Agentic AI capabilities
+- Use AWS AI/ML services (Bedrock, SageMaker, etc.)
+- Deploy on AWS using serverless or containerized architecture
+- Document the AI architecture and data flow
+- Provide a live demo of the AI features
+
+**Deliverables:**
+
+1. **AI Architecture Documentation** - Architecture diagram
+2. **Deployed AI Application** - Live application with working AI features on AWS
+3. **Demo Presentation** - 5-10 minute demonstration of AI capabilities, and infrastracture built on AWS
+
+## Project 2 - AI Application Examples
+
+- Intelligent document Q&A system (RAG)
+- AI-powered customer support chatbot
+- Content generation platform with knowledge base
+- Smart research assistant with web scraping
+- AI code review and suggestion tool
+- Personalized learning recommendation system
diff --git a/courses/cloud&ai/serverless-aws/README.md b/courses/cloud&ai/serverless-aws/README.md
new file mode 100644
index 00000000..4e7d08c3
--- /dev/null
+++ b/courses/cloud&ai/serverless-aws/README.md
@@ -0,0 +1,8 @@
+# Serverless on AWS
+
+This module introduces serverless computing concepts and AWS serverless services, teaching trainees to build and deploy serverless applications.
+
+| Week | Topic                                                       |
+| ---- | ----------------------------------------------------------- |
+| 1.   | [Introduction to Serverless Development](./week1/README.md) |
+| 2.   | [Serverless Development Workshop](./week2/README.md)        |
diff --git a/courses/cloud&ai/serverless-aws/week1/README.md b/courses/cloud&ai/serverless-aws/week1/README.md
new file mode 100644
index 00000000..626ff2d6
--- /dev/null
+++ b/courses/cloud&ai/serverless-aws/week1/README.md
@@ -0,0 +1,17 @@
+# Serverless on AWS (Week 1)
+
+This module introduces serverless computing components on AWS.
+
+| Week | Topic                               | Content                                                                                                                                               | Description                               |
+| ---- | ----------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------- |
+| 1.   | Introduction to Serverless          | [Introduction to Serverless Development](https://skillbuilder.aws/learn/K91QMT385B/introduction-to-serverless-development/MJZW4JPH9C)                 | Fundamentals of serverless computing      |
+| 1.   | Serverless Mindset                  | [Getting into the Serverless Mindset](https://skillbuilder.aws/learn/6V6HTC5W5D/getting-into-the-serverless-mindset/4EF5792A2K)                       | Thinking serverless-first in architecture |
+| 1.   | API Gateway & Lambda                | [Amazon API Gateway for Serverless Applications](https://skillbuilder.aws/learn/GQA6FHWPJD/amazon-api-gateway-for-serverless-applications/JVRZ3PSW4H) | Building APIs with Lambda functions       |
+| 1.   | DynamoDB in serverless architecture | [Amazon DynamoDB for Serverless Architectures](https://skillbuilder.aws/learn/SY1Y83VKTB/amazon-dynamodb-for-serverless-architectures/K9NM3PHH3S)     | NoSQL database for serverless apps        |
+
+## Learning goals
+
+- [ ] Understand serverless computing concepts and benefits
+- [ ] Develop serverless mindset and architectural patterns
+- [ ] Work with AWS Lambda and API Gateway
+- [ ] Use DynamoDB in serverless applications
diff --git a/courses/cloud&ai/serverless-aws/week2/README.md b/courses/cloud&ai/serverless-aws/week2/README.md
new file mode 100644
index 00000000..09322fa9
--- /dev/null
+++ b/courses/cloud&ai/serverless-aws/week2/README.md
@@ -0,0 +1,15 @@
+# Serverless on AWS (Week 2)
+
+This module allow you to build your own serverless application on AWS
+
+| Week | Topic    | Content                                                                                                                                           | Description                              |
+| ---- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- |
+| 2.   | Workshop | [Getting started with serverless applications](https://catalog.us-east-1.prod.workshops.aws/workshops/c42525c3-ac8c-4ba6-acd7-378c5b6dd8ac/en-US) | Hands-on serverless application workshop |
+
+## Learning goals
+
+- [ ] Build complete serverless applications
+
+## Prerequisites
+
+Trainees should have completed the [Serverless on AWS Week1](../week1/README.md) before starting this workshop.
diff --git a/package-lock.json b/package-lock.json
index 17275fc7..1528a118 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "program",
+  "name": "HackYourFutureCPH",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
@@ -187,6 +187,7 @@
       "integrity": "sha512-t54CUOsFMappY1Jbzb7fetWeO0n6K0k/4+/ZpkS+3Joz8I4VcvY9OiEBFRYISqaI2fq5sCiPtAjRDOzVYG8m+Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@octokit/auth-token": "^6.0.0",
         "@octokit/graphql": "^9.0.2",