diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md
index 58b54700..72fcbdbf 100644
--- a/docs/CONFIG-VARS.md
+++ b/docs/CONFIG-VARS.md
@@ -298,7 +298,7 @@ Each server element, like `foo = {}`, can contain none, some, or all of the para
 <!--| Name | Description | Type | Default | Notes | -->
 | <div style="width:50px">Name</div> | <div style="width:150px">Description</div> | <div style="width:50px">Type</div> | <div style="width:75px">Default</div> | <div style="width:150px">Notes</div> |
 | :--- | :--- | :--- | :--- | :--- |
-| server_version | The version of the PostgreSQL server | string | "12" | Refer to the [Viya 4 Administration Guide](https://go.documentation.sas.com/doc/en/sasadmincdc/default/itopssr/p05lfgkwib3zxbn1t6nyihexp12n.htm?fromDefault=#p1wq8ouke3c6ixn1la636df9oa1u) for the supported versions of PostgreSQL for SAS Viya. |
+| server_version | The version of the PostgreSQL server | string | "13" | Refer to the [Viya 4 Administration Guide](https://go.documentation.sas.com/doc/en/sasadmincdc/default/itopssr/p05lfgkwib3zxbn1t6nyihexp12n.htm?fromDefault=#p1wq8ouke3c6ixn1la636df9oa1u) for the supported versions of PostgreSQL for SAS Viya. |
 | instance_type | The VM type for the PostgreSQL Server | string | "db.m5.xlarge" | |
 | storage_size | Max storage allowed for the PostgreSQL server in MB | number | 50 |  |
 | backup_retention_days | Backup retention days for the PostgreSQL server | number | 7 | Supported values are between 7 and 35 days. |
@@ -328,7 +328,7 @@ database_servers = {
     deletion_protection          = false
     administrator_login          = "cpsadmin"
     administrator_password       = "1tsAB3aut1fulDay"
-    server_version               = "12"
+    server_version               = "13"
     server_port                  = "5432"
     ssl_enforcement_enabled      = true
     parameters                   = [{ "apply_method": "immediate", "name": "foo" "value": "true" }, { "apply_method": "immediate", "name": "bar" "value": "false" }]
diff --git a/locals.tf b/locals.tf
index 5571203d..1065d4bc 100755
--- a/locals.tf
+++ b/locals.tf
@@ -33,7 +33,7 @@ locals {
   # Mapping node_pools to node_groups
   default_node_pool = {
     default = {
-      name                              = "${local.cluster_name}-default"
+      name                              = "default"
       instance_types                     = [var.default_nodepool_vm_type]
       block_device_mappings           = {
         xvda = {
@@ -67,6 +67,7 @@ locals {
       create_launch_template          = true
       launch_template_name            = "${local.cluster_name}-default-lt"
       launch_template_use_name_prefix = true
+      launch_template_tags            = { Name = "${local.cluster_name}-default" }
       tags                            = var.autoscaling_enabled ? merge(var.tags, { key = "k8s.io/cluster-autoscaler/${local.cluster_name}", value = "owned", propagate_at_launch = true }, { key = "k8s.io/cluster-autoscaler/enabled", value = "true", propagate_at_launch = true}) : var.tags
     }
   }
@@ -74,7 +75,7 @@ locals {
   user_node_pool = {
     for key, np_value in var.node_pools :
       key => {
-        name                            = "${local.cluster_name}-${key}"
+        name                            = key
         instance_types                  = [np_value.vm_type]
         ami_type                        = np_value.cpu_type
         disk_size                       = np_value.os_disk_size
@@ -101,7 +102,7 @@ locals {
         labels                          = np_value.node_labels
         # User data
         bootstrap_extra_args            = "--kubelet-extra-args '--node-labels=${replace(replace(jsonencode(np_value.node_labels), "/[\"\\{\\}]/", ""), ":", "=")} --register-with-taints=${join(",", np_value.node_taints)}' "
-        pre_bootstrap_user_data        = (np_value.custom_data != "" ? file(np_value.custom_data) : "")
+        pre_bootstrap_user_data         = (np_value.custom_data != "" ? file(np_value.custom_data) : "")
         metadata_options                = { 
             http_endpoint               = var.default_nodepool_metadata_http_endpoint
             http_tokens                 = var.default_nodepool_metadata_http_tokens
@@ -111,6 +112,7 @@ locals {
         create_launch_template          = true
         launch_template_name            = "${local.cluster_name}-${key}-lt"
         launch_template_use_name_prefix = true
+        launch_template_tags            = { Name = "${local.cluster_name}-${key}" }
         tags                            = var.autoscaling_enabled ? merge(var.tags, { key = "k8s.io/cluster-autoscaler/${local.cluster_name}", value = "owned", propagate_at_launch = true }, { key = "k8s.io/cluster-autoscaler/enabled", value = "true", propagate_at_launch = true}) : var.tags
       }
   }
diff --git a/variables.tf b/variables.tf
index b7164795..b72499ef 100644
--- a/variables.tf
+++ b/variables.tf
@@ -426,7 +426,7 @@ variable "postgres_server_defaults" {
     deletion_protection          = false
     administrator_login          = "pgadmin"
     administrator_password       = "my$up3rS3cretPassw0rd"
-    server_version               = "12"
+    server_version               = "13"
     server_port                  = "5432"
     ssl_enforcement_enabled      = true
     parameters                   = []