diff --git a/samples/DotNet/GettingStarted/BasicSendReceiveQuickStart/dotnet-basic-send-receive.yml b/samples/DotNet/GettingStarted/BasicSendReceiveQuickStart/dotnet-basic-send-receive.yml
new file mode 100644
index 00000000..9ade186f
--- /dev/null
+++ b/samples/DotNet/GettingStarted/BasicSendReceiveQuickStart/dotnet-basic-send-receive.yml
@@ -0,0 +1,12 @@
+### YamlMime:Sample
+sample:
+- name: 'Azure Service Bus - Basic Send/Receieve in .NET'
+  description: 'A sample demonstrating the basic send/receive operations with Azure Service Bus, using the .NET platform.'
+  generateZip: true
+  author: celemensv
+  languages:
+  - csharp
+  technologies:
+  - service-bus
+  - service-bus-messaging
+  - azure
diff --git a/samples/DotNet/GettingStarted/BasicSendReceiveTutorialwithFilters/dotnet-basic-send-receive-filters.yml b/samples/DotNet/GettingStarted/BasicSendReceiveTutorialwithFilters/dotnet-basic-send-receive-filters.yml
new file mode 100644
index 00000000..79f2d356
--- /dev/null
+++ b/samples/DotNet/GettingStarted/BasicSendReceiveTutorialwithFilters/dotnet-basic-send-receive-filters.yml
@@ -0,0 +1,12 @@
+### YamlMime:Sample
+sample:
+- name: 'Azure Service Bus - Basic Send/Receieve with Filters in .NET'
+  description: 'A sample demonstrating the basic send/receive operations with Azure Service Bus, using the .NET platform.'
+  generateZip: true
+  author: celemensv
+  languages:
+  - csharp
+  technologies:
+  - service-bus
+  - service-bus-messaging
+  - azure
diff --git a/samples/DotNet/Microsoft.Azure.ServiceBus/messaging-samples.yml b/samples/DotNet/Microsoft.Azure.ServiceBus/messaging-samples.yml
new file mode 100644
index 00000000..680dc265
--- /dev/null
+++ b/samples/DotNet/Microsoft.Azure.ServiceBus/messaging-samples.yml
@@ -0,0 +1,13 @@
+### YamlMime:Sample
+sample:
+- name: 'Azure Service Bus .NET Standard samples'
+  description: 'Official set of .NET Standard samples for the Azure Service Bus service.'
+  generateZip: true
+  author: celemensv
+  readme: README.md
+  languages:
+  - csharp
+  technologies:
+  - service-bus
+  - service-bus-messaging
+  - azure
diff --git a/samples/Java/java-sample.yml b/samples/Java/java-sample.yml
index ca50fac7..05b32671 100644
--- a/samples/Java/java-sample.yml
+++ b/samples/Java/java-sample.yml
@@ -6,7 +6,7 @@ sample:
   author: celemensv
   readme: readme.md
   languages:
-  - csharp
+  - java
   technologies:
   - service-bus
   - service-bus-messaging