diff --git a/docs/aws-samples-boilerplates.md b/docs/aws-samples-boilerplates.md
deleted file mode 100644
index 87a298a3..00000000
--- a/docs/aws-samples-boilerplates.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# AWS Samples (Boilerplates)
-- [github.com/aws-samples 🌟](https://github.com/aws-samples)
-- [github.com/aws-samples/aws-auto-inventory: AWS Automated Inventory 🌟](https://github.com/aws-samples/aws-auto-inventory) A command line tool that allows you to quickly and easily generate inventory reports of your AWS resources.
-- [github.com/aws-samples/aws-waf-ops-dashboards](https://github.com/aws-samples/aws-waf-ops-dashboards) In this repository, we share code for building infrastructure to collect, enrich, and visualize AWS Web Application Firewall logs. Implementing this project in your AWS account will allow you to view and filter the logs through Kibana dashboards below, as well as customize views and dashboards to your needs.
-- [github.com/aws-samples/aws-customer-playbook-framework 🌟](https://github.com/aws-samples/aws-customer-playbook-framework) This repository provides sample templates for security playbooks against various scenarios when using Amazon Web Services.
diff --git a/docs/aws-tools-scripts.md b/docs/aws-tools-scripts.md
index fb88587c..85504f4a 100644
--- a/docs/aws-tools-scripts.md
+++ b/docs/aws-tools-scripts.md
@@ -1,5 +1,6 @@
 # AWS Tools and Scripts
 - [AWS Scripts](#aws-scripts)
+- [AWS Samples (Boilerplates)](#aws-samples-boilerplates)
 - [Open Source at AWS](#open-source-at-aws)
 - [AWS Tools](#aws-tools)
 - [AWS Toolkits](#aws-toolkits)
@@ -15,6 +16,9 @@
 - https://github.com/dannysteenman/aws-toolbox A collection of useful Shell & Python scripts that make your DevOps life easier in AWS. Furthermore you'll also find a list of links that point to awesome DevOps tools from other creators.
 - [saml-to/assume-aws-role-action](https://github.com/saml-to/assume-aws-role-action) Assume AWS IAM Roles using SAML.to in GitHub Actions. This action enables workflows to obtain AWS Access Credentials for a desired IAM Role using AWS IAM SAML and a GitHub Actions Repository Token.
 
+## AWS Samples (Boilerplates)
+- [AWS Samples (Boilerplates)](demos.md)
+
 ## Open Source at AWS
 - [OpenSource at AWS](https://aws.github.io/)
 
diff --git a/docs/demos.md b/docs/demos.md
index 46528a3c..ab96c7dc 100644
--- a/docs/demos.md
+++ b/docs/demos.md
@@ -64,7 +64,7 @@
     - [PetClinic on Kubernetes](#petclinic-on-kubernetes)
     - [PetClinic Docker images](#petclinic-docker-images)
     - [OpenShift.io Samples](#openshiftio-samples)
-- [AWS Samples](#aws-samples)
+- [AWS Samples (Boilerplates)](#aws-samples-boilerplates)
 - [Azure Samples](#azure-samples)
     - [Azure DevOps Demos. Azure DevOps Pipelines](#azure-devops-demos-azure-devops-pipelines)
     - [Azure Demos](#azure-demos)
@@ -634,9 +634,12 @@ Grab them from here: [awesome-kubernetes/scripts](https://github.com/nubenetes/a
 * [OpenShift.io Samples 🌟🌟](https://che.openshift.io/dashboard/#/getstarted)
 * [github.com/che-samples](https://github.com/che-samples)
 
-## AWS Samples
+## AWS Samples (Boilerplates)
+- [==github.com/aws-samples== 🌟](https://github.com/aws-samples)
+- [github.com/aws-samples/aws-auto-inventory: AWS Automated Inventory 🌟](https://github.com/aws-samples/aws-auto-inventory) A command line tool that allows you to quickly and easily generate inventory reports of your AWS resources.
+- [github.com/aws-samples/aws-waf-ops-dashboards](https://github.com/aws-samples/aws-waf-ops-dashboards) In this repository, we share code for building infrastructure to collect, enrich, and visualize AWS Web Application Firewall logs. Implementing this project in your AWS account will allow you to view and filter the logs through Kibana dashboards below, as well as customize views and dashboards to your needs.
+- [github.com/aws-samples/aws-customer-playbook-framework 🌟](https://github.com/aws-samples/aws-customer-playbook-framework) This repository provides sample templates for security playbooks against various scenarios when using Amazon Web Services.
 - [github.com/miztiik/AWS-Demos](https://github.com/miztiik/AWS-Demos)
-- [github.com/aws-samples](https://github.com/aws-samples)
 - [github.com/aws-samples/aws-training-demo](https://github.com/aws-samples/aws-training-demo)
 - [==aws-samples/aws-network-hub-for-terraform: Network Hub Account with Terraform==](https://github.com/aws-samples/aws-network-hub-for-terraform) This repository demonstrates a scalable, segregated, secured AWS network for multi-account organizations. Using Transit Gateway to separate production, non-production and shared services traffic, it deploys an advanced AWS networking pattern using centralized ingress and egress behind Network Firewall, centralizes private VPC endpoints to share across all VPCs, and manages IP address allocation using Amazon VPC IPAM.
 - [cyberciti.biz: How to create MySQL user and grant permissions in AWS RDS](https://www.cyberciti.biz/faq/how-to-create-mysql-user-and-grant-permissions-in-aws-rds/)
diff --git a/docs/index.md b/docs/index.md
index 4c02112c..4cd196a4 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -173,7 +173,6 @@ A curated list of awesome references collected since 2018. Microservices archite
     - [AWS Security](aws-security.md)
     - [AWS Monitoring](aws-monitoring.md)
     - [AWS IaC](aws-iac.md)
-    - [AWS Samples Boilerplates](aws-samples-boilerplates.md)
     - [AWS Tools Scripts](aws-tools-scripts.md)
     - [AWS Data](aws-data.md)
     - [AWS DevOps](aws-devops.md)
diff --git a/mkdocs.yml b/mkdocs.yml
index bdd35c1f..4d5d8fef 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -199,7 +199,6 @@ nav:
       - AWS Security: aws-security.md
       - AWS Monitoring: aws-monitoring.md
       - AWS IaC: aws-iac.md
-      - AWS Samples Boilerplates: aws-samples-boilerplates.md
       - AWS Tools Scripts: aws-tools-scripts.md
       - AWS Data: aws-data.md
       - AWS DevOps: aws-devops.md