diff --git a/.github/workflows/module-test-pipeline.yml b/.github/workflows/module-test-pipeline.yml
index 2743b1b..1d2cce9 100644
--- a/.github/workflows/module-test-pipeline.yml
+++ b/.github/workflows/module-test-pipeline.yml
@@ -29,6 +29,7 @@ jobs:
         run: |
           pushd ci/template-test
           terraform init
+          terraform validate
           # Create
           terraform plan
           terraform apply -auto-approve
@@ -41,6 +42,7 @@ jobs:
         run: |
           pushd ci/module-test
           terraform init
+          terraform validate
           # Create
           terraform plan
           terraform apply -auto-approve
diff --git a/internal/gen-template/variables.tf b/internal/gen-template/variables.tf
index 3c0f2a4..cd2ca98 100644
--- a/internal/gen-template/variables.tf
+++ b/internal/gen-template/variables.tf
@@ -6,11 +6,11 @@ variable "msg_vpn_name" {
 }
 
 variable "endpoint_type" {
-  description = "Queue endpoint type"
+  description = "Queue endpoint type. Must be one of `queue`, `topic_endpoint`, `queue_template` or `topic_endpoint_template`."
   type        = string
   validation {
     condition     = contains(["queue", "topic_endpoint", "queue_template", "topic_endpoint_template"], var.endpoint_type)
-    error_message = "The endpoint_type must be one of 'queue', 'topic_endpoint', 'queue_template' or 'topic_endpoint_template'."
+    error_message = "The endpoint_type must be one of `queue`, `topic_endpoint`, `queue_template` or `topic_endpoint_template`."
   }
 }
 
@@ -20,7 +20,7 @@ variable "endpoint_name" {
 }
 
 variable "queue_subscription_topics" {
-  description = "List of queue subscription topics. Only valid if endpoint type is 'queue'."
+  description = "List of queue subscription topics. Only valid if endpoint type is `queue`."
   type        = list(string)
   default     = []
 }
diff --git a/variables.tf b/variables.tf
index ccfb0e4..b5451a2 100644
--- a/variables.tf
+++ b/variables.tf
@@ -6,11 +6,11 @@ variable "msg_vpn_name" {
 }
 
 variable "endpoint_type" {
-  description = "Queue endpoint type"
+  description = "Queue endpoint type. Must be one of `queue`, `topic_endpoint`, `queue_template` or `topic_endpoint_template`."
   type        = string
   validation {
     condition     = contains(["queue", "topic_endpoint", "queue_template", "topic_endpoint_template"], var.endpoint_type)
-    error_message = "The endpoint_type must be one of 'queue', 'topic_endpoint', 'queue_template' or 'topic_endpoint_template'."
+    error_message = "The endpoint_type must be one of `queue`, `topic_endpoint`, `queue_template` or `topic_endpoint_template`."
   }
 }
 
@@ -20,7 +20,7 @@ variable "endpoint_name" {
 }
 
 variable "queue_subscription_topics" {
-  description = "List of queue subscription topics. Only valid if endpoint type is 'queue'."
+  description = "List of queue subscription topics. Only valid if endpoint type is `queue`."
   type        = list(string)
   default     = []
 }