diff --git a/ci-cd/github/composite-actions/README.md b/ci-cd-and-automation/github/composite-actions/README.md
similarity index 100%
rename from ci-cd/github/composite-actions/README.md
rename to ci-cd-and-automation/github/composite-actions/README.md
diff --git a/ci-cd/github/composite-actions/docker-build-and-push/README.md b/ci-cd-and-automation/github/composite-actions/docker-build-and-push/README.md
similarity index 95%
rename from ci-cd/github/composite-actions/docker-build-and-push/README.md
rename to ci-cd-and-automation/github/composite-actions/docker-build-and-push/README.md
index 71b3019..480b995 100644
--- a/ci-cd/github/composite-actions/docker-build-and-push/README.md
+++ b/ci-cd-and-automation/github/composite-actions/docker-build-and-push/README.md
@@ -25,7 +25,7 @@ steps:
   # ...
 
   - name: Build and push Docker image to a registry
-    uses: warestack/blueprints/ci-cd/github/composite-actions/action.yaml@main
+    uses: warestack/blueprints/ci-cd-and-automation/github/composite-actions/action.yaml@main
     with:
       image-name: 'sample-app'
       registry-url: ${{ steps.<login_step_id>.outputs.registry }}
diff --git a/ci-cd/github/composite-actions/docker-build-and-push/action.yaml b/ci-cd-and-automation/github/composite-actions/docker-build-and-push/action.yaml
similarity index 100%
rename from ci-cd/github/composite-actions/docker-build-and-push/action.yaml
rename to ci-cd-and-automation/github/composite-actions/docker-build-and-push/action.yaml
diff --git a/ci-cd/github/composite-actions/docker-build-and-push/examples/example_workflow.yaml b/ci-cd-and-automation/github/composite-actions/docker-build-and-push/examples/example_workflow.yaml
similarity index 96%
rename from ci-cd/github/composite-actions/docker-build-and-push/examples/example_workflow.yaml
rename to ci-cd-and-automation/github/composite-actions/docker-build-and-push/examples/example_workflow.yaml
index 24b6e8b..002a011 100644
--- a/ci-cd/github/composite-actions/docker-build-and-push/examples/example_workflow.yaml
+++ b/ci-cd-and-automation/github/composite-actions/docker-build-and-push/examples/example_workflow.yaml
@@ -65,7 +65,7 @@ jobs:
 
       # Build and push image
       - name: Build and push image
-        uses: warestack/blueprints/ci-cd/github/composite-actions/action.yaml@main
+        uses: warestack/blueprints/ci-cd-and-automation/github/composite-actions/action.yaml@main
         with:
           registry_url: ${{ steps.construct_registry_url.outputs.registry_url }}
           image_name: ${{ env.IMAGE_NAME }}
diff --git a/ci-cd-and-automation/github/composite-actions/docker-build-and-push/metadata.json b/ci-cd-and-automation/github/composite-actions/docker-build-and-push/metadata.json
new file mode 100644
index 0000000..4535fa1
--- /dev/null
+++ b/ci-cd-and-automation/github/composite-actions/docker-build-and-push/metadata.json
@@ -0,0 +1,7 @@
+{
+  "name": "Docker Build and Push",
+  "description": "A GitHub Composite Action that builds a Docker image from your application and pushes it to a Docker registry.",
+  "type": "blueprint",
+  "version": "1.0.0",
+  "tags": ["Docker", "GitHub Actions", "CI/CD", "Composite Action", "Deployment"]
+}
diff --git a/ci-cd-and-automation/github/composite-actions/metadate.json b/ci-cd-and-automation/github/composite-actions/metadate.json
new file mode 100644
index 0000000..2872ce6
--- /dev/null
+++ b/ci-cd-and-automation/github/composite-actions/metadate.json
@@ -0,0 +1,6 @@
+{
+  "name": "Composite Actions",
+  "type": "category",
+  "description": "Reusable composite actions for GitHub Actions, enabling complex workflows to be composed from simpler, single-purpose actions.",
+  "tags": ["GitHub Actions", "Composite Actions", "Reusable"]
+}
diff --git a/ci-cd-and-automation/github/metadate.json b/ci-cd-and-automation/github/metadate.json
new file mode 100644
index 0000000..c1e0d7a
--- /dev/null
+++ b/ci-cd-and-automation/github/metadate.json
@@ -0,0 +1,6 @@
+{
+  "name": "GitHub",
+  "type": "category",
+  "description": "Blueprints and workflows tailored for GitHub Actions, including composite actions and reusable workflows for common CI/CD tasks.",
+  "tags": ["GitHub", "GitHub Actions", "CI/CD"]
+}
diff --git a/ci-cd-and-automation/metadata.json b/ci-cd-and-automation/metadata.json
new file mode 100644
index 0000000..34fffd5
--- /dev/null
+++ b/ci-cd-and-automation/metadata.json
@@ -0,0 +1,6 @@
+{
+  "name": "CI/CD & Automation",
+  "type": "category",
+  "description": "Contains blueprints for Continuous Integration and Continuous Deployment, including automation tools and workflows for various technologies.",
+  "tags": ["CI/CD", "Automation", "DevOps"]
+}
diff --git a/ci-cd/github/composite-actions/docker-build-and-push/metadata.json b/ci-cd/github/composite-actions/docker-build-and-push/metadata.json
deleted file mode 100644
index 18f8c18..0000000
--- a/ci-cd/github/composite-actions/docker-build-and-push/metadata.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "docker-build-and-push",
-  "category": "CI/CD & Automation",
-  "type": "GitHub Composite Action",
-  "tags": ["Docker", "Continuous Integration", "Continuous Deployment"]
-}