diff --git a/.devcontainer/.devcontainer.json b/.devcontainer/devcontainer.json
similarity index 100%
rename from .devcontainer/.devcontainer.json
rename to .devcontainer/devcontainer.json
diff --git a/website/static/templates.json b/website/static/templates.json
index f5012b3b..e81eba13 100644
--- a/website/static/templates.json
+++ b/website/static/templates.json
@@ -422,6 +422,26 @@
       "msft"
     ]
   },
+  {
+    "title": "Chat with your Data Solution Accelerator",
+    "description": "A Solution Accelerator for the RAG pattern running in Azure, using Azure AI Search for retrieval and Azure OpenAI large language models to power ChatGPT-style and Q&A experiences. This includes most common requirements and best practices.",
+    "preview": "./templates/images/cwyd-solution-architecture.png",
+    "website": "https://github.com/Azure-Samples",
+    "author": "Azure Content Team",
+    "source": "https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator",
+    "tags": [
+      "bicep",
+      "python",
+      "typescript",
+      "flask",
+      "cognitivesearch",
+      "openai",
+      "chatgpt",
+      "ai",
+      "msft",
+      "new"
+    ]
+  },
   {
     "title": "Simple Chat Application using Azure OpenAI",
     "description": "A sample chat app that uses Python and the Flask framework to stream ChatGPT completions as server-sent events to a simple frontend.",
diff --git a/website/static/templates/images/cwyd-solution-architecture.png b/website/static/templates/images/cwyd-solution-architecture.png
new file mode 100644
index 00000000..37c6bbb3
Binary files /dev/null and b/website/static/templates/images/cwyd-solution-architecture.png differ