diff --git a/docs/resources/dbs_sqs_subscriber.md b/docs/resources/dbs_sqs_subscriber.md
index 262ce67d..111d0909 100644
--- a/docs/resources/dbs_sqs_subscriber.md
+++ b/docs/resources/dbs_sqs_subscriber.md
@@ -30,23 +30,26 @@ resource "hsdp_dbs_sqs_subscriber" {
 The following arguments are supported:
 
 * `name_infix` - (Required) The name infix of the subscriber
-* `description` - (Optional) A short description of the subscriber
+* `description` - (Required) A short description of the subscriber
 * `queue_type` - (Required) The type of queue to create [`Standard` | `FIFO`]
 * `delivery_delay_seconds` - (Optional) The time in seconds that the delivery of all messages in the queue will be delayed. An integer from 0 to 900 (15 minutes). The default is 0 (zero).
 * `message_retention_period_seconds` - (Optional) The number of seconds Amazon SQS retains a message. Integer representing seconds, from 60 (1 minute) to 1209600 (14 days). The default is 345600 (4 days).
 * `receive_wait_time_seconds` - (Optional) The time for which a ReceiveMessage call will wait for a message to arrive (long polling) before returning. An integer from 0 to 20 (seconds). The default is 0 (zero).
-* `server_side_encryption` - (Optional) Boolean designating whether to enable server-side encryption. Default is `false`
+* `server_side_encryption` - (Optional) Boolean designating whether to enable server-side encryption. Default is `true`
 
 ## Attributes reference
 
 In addition to all arguments above, the following attributes are exported:
 
-* `id` - The ID reference of the subscriber (format: `Subscriber/${GUID}`)
+* `id` - The ID reference of the subscriber (format: `${GUID}`)
+* `name` - The name of the subscriber
 * `status` - The status of the subscriber
-* `queue_name` - The name of the queue
-
+* `queue_name` - The name of the SQS queue
 
 ## Import
 
-DBS SQS Subscribers cannot be imported into this resource.
+An existing SQS Subscriber using `terraform import hsdp_dbs_sqs_subscriber`, e.g.
 
+```bash
+terraform import hsdp_dbs_sqs_subscriber.target guid-of-the-subscriber-to-import
+```
diff --git a/docs/resources/dbs_subscription_topic.md b/docs/resources/dbs_subscription_topic.md
deleted file mode 100644
index cc14482a..00000000
--- a/docs/resources/dbs_subscription_topic.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-subcategory: "Data Broker Service (DBS)"
-page_title: "HSDP: hsdp_dbs_subscription_topic"
-description: |-
-  Manages Connect DBS SQS Subscription topics
----
-
-# hsdp_dbs_subscription_topic
-
-Manages Connect DBS SQS Subscription topics
-
-## Example Usage
-
-```hcl
-resources "hsdp_dbs_subscription_topic" "my-topic" {
-  name  = "my-topic"
-  description = "My topic"
-  
-  subscriber_id = hsdp_dbs_sqs_subscriber.my-subscriber.id
-  
-  deliver_data_only = true
-  
-  data_type ="some-type"
-  rule_name = "some-rule"
-}
-```
-
-## Argument Reference
-
-The following arguments are supported:
-
-* `name` - (Required) The name of the topic
-* `description` - (Required) A short description of the topic
-* `subscriber_id` - (Required) The ID of the subscriber to associate with this topic
-* `deliver_data_only` - (Optional) Boolean designating whether to deliver only data (true) or data and metadata (false). Default is `false`
-* `data_type` - (Required) The data type of the topic
-* `rule_name` - (Required) The rule name of the topic
-
-## Attributes reference
-
-In addition to all arguments above, the following attributes are exported:
-
-* `id` - The ID reference of the topic (format: `Topic/${GUID}`)
-* `status` - The status of the topic
-
-## Import
-
-DBS SQS Subscription topics cannot be imported into this resource.
diff --git a/docs/resources/dbs_topic_subscription.md b/docs/resources/dbs_topic_subscription.md
new file mode 100644
index 00000000..8d16e91b
--- /dev/null
+++ b/docs/resources/dbs_topic_subscription.md
@@ -0,0 +1,53 @@
+---
+subcategory: "Data Broker Service (DBS)"
+page_title: "HSDP: hsdp_dbs_subscription_topic"
+description: |-
+  Manages Connect DBS SQS Subscription topics
+---
+
+# hsdp_dbs_topic_subscription
+
+Manages Connect DBS Topic Subscriptions
+
+## Example Usage
+
+```hcl
+resources "hsdp_dbs_topic_subscription" "my-topic" {
+  name_infix  = "my-topic"
+  description = "My topic"
+  
+  data_type     = "some-type"
+  subscriber_id = hsdp_dbs_sqs_subscriber.my-subscriber.id
+  
+  deliver_data_only = true
+  
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name_infix` - (Required) The name infix of the subscription
+* `description` - (Required) A short description of the subscription
+* `subscriber_id` - (Required) The ID of the subscriber to associate with this topic subscription
+* `data_type` - (Required) The data type of the topic
+* `deliver_data_only` - (Optional) Boolean designating whether to deliver only data (true) or data and metadata (false). Default is `false`
+* `kinesis_stream_partition_key` - (Optional) When used in combination with a Kinesis Subscriber, the Stream Partition Key for inserting the data into the Kinesis Stream needs to be provided. Example:= `${newuuid()}`
+
+## Attributes reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `id` - The ID reference of the subscription (format: `${GUID}`)
+* `name` - The name of the subscription
+* `status` - The status of the subscription
+* `rule_name` - The rule name of the subscription
+
+## Import
+
+An existing Topic subscription using `terraform import hsdp_dbs_topic_subscription`, e.g.
+
+```bash
+terraform import hsdp_dbs_topic_subscription.target guid-of-the-subscription-to-import
+```