diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index e3a182057c..5c45071119 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -15,6 +15,7 @@ _Put an `x` in the boxes that apply_
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
 - [ ] Documentation Update (if none of the other choices apply)
 - [ ] Regular KTLO or any of the maintaince work. e.g code style
+- [ ] CICD Improvement
 
 ## Impacted Components
 
@@ -28,6 +29,7 @@ _Put an `x` in the boxes that apply_
 - [ ] EVM
 - [ ] Account
 - [ ] Not sure
+- [ ] N/A
 
 ## Checklist
 _Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._
@@ -36,4 +38,5 @@ _Put an `x` in the boxes that apply. You can also fill these out after creating
 - [ ] Provide an end-to-end test plan in the PR description on how to manually test it on the devnet/testnet.
 - [ ] Tested the backwards compatibility.
 - [ ] Tested with XDC nodes running this version co-exist with those running the previous version.
-- [ ] Relevant documentation has been updated as part of this PR
\ No newline at end of file
+- [ ] Relevant documentation has been updated as part of this PR
+- [ ] N/A
\ No newline at end of file
diff --git a/cicd/devnet/terraform/container-definition.tpl b/cicd/devnet/terraform/container-definition.tpl
deleted file mode 100644
index 72a5b52e50..0000000000
--- a/cicd/devnet/terraform/container-definition.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-  {
-    "name": "tfXdcNode",
-    "image": "xinfinorg/${xdc_environment}:${image_tag}",
-    "environment": [
-      {"name": "PRIVATE_KEYS", "value": "${private_keys}"},
-      {"name": "LOG_LEVEL", "value": "${log_level}"},
-      {"name": "NODE_NAME", "value": "${node_name}"}
-    ],
-    "essential": true,
-    "logConfiguration": {
-      "logDriver": "awslogs",
-      "options": {
-        "awslogs-group": "${cloudwatch_group}",
-        "awslogs-region": "us-east-1",
-        "awslogs-stream-prefix": "ecs"
-      }
-    },
-    "portMappings": [
-      {
-        "hostPort": 8555,
-        "protocol": "tcp",
-        "containerPort": 8555
-      },
-      {
-        "hostPort": 8545,
-        "protocol": "tcp",
-        "containerPort": 8545
-      },
-      {
-        "hostPort": 30303,
-        "protocol": "tcp",
-        "containerPort": 30303
-      }
-    ],
-    "mountPoints": [
-      {
-        "containerPath": "/work/xdcchain",
-        "sourceVolume": "efs"
-      }
-    ]
-  }
-]
\ No newline at end of file
diff --git a/cicd/devnet/terraform/module/region/container-definition.tpl b/cicd/devnet/terraform/module/region/container-definition.tpl
index ae1fcc227f..e41e1662d2 100644
--- a/cicd/devnet/terraform/module/region/container-definition.tpl
+++ b/cicd/devnet/terraform/module/region/container-definition.tpl
@@ -5,7 +5,8 @@
     "environment": [
       {"name": "PRIVATE_KEYS", "value": "${private_keys}"},
       {"name": "LOG_LEVEL", "value": "${log_level}"},
-      {"name": "NODE_NAME", "value": "${node_name}"}
+      {"name": "NODE_NAME", "value": "${node_name}"},
+      {"name": "NETWORK", "value": "${chain_network}"}
     ],
     "essential": true,
     "logConfiguration": {
diff --git a/cicd/devnet/terraform/module/region/ecs.tf b/cicd/devnet/terraform/module/region/ecs.tf
index 2546da4018..235e38dd0f 100644
--- a/cicd/devnet/terraform/module/region/ecs.tf
+++ b/cicd/devnet/terraform/module/region/ecs.tf
@@ -10,6 +10,7 @@ data template_file devnet_container_definition {
     cloudwatch_group = "tf-${each.key}"
     cloudwatch_region = "${var.region}"
     log_level = "${lookup(each.value, "logLevel", "${var.logLevel}")}"
+    chain_network = "devnet"
   }
 }
 
@@ -81,7 +82,7 @@ resource "aws_ecs_service" "devnet_ecs_service" {
       aws_default_security_group.devnet_xdcnode_security_group.id
     ]
   }
-  
+
   deployment_circuit_breaker {
     enable = true
     rollback = false
diff --git a/consensus/XDPoS/utils/errors.go b/consensus/XDPoS/utils/errors.go
index 3db4cc8c8b..7692614fee 100644
--- a/consensus/XDPoS/utils/errors.go
+++ b/consensus/XDPoS/utils/errors.go
@@ -47,7 +47,7 @@ var (
 
 	ErrInvalidCheckpointPenalties = errors.New("invalid penalty list on checkpoint block")
 
-	ErrValidatorsNotLegit = errors.New("validators does not match what's stored in snapshot minutes its penalty")
+	ErrValidatorsNotLegit = errors.New("validators does not match what's stored in snapshot minus its penalty")
 	ErrPenaltiesNotLegit  = errors.New("penalties does not match")
 
 	// errInvalidMixDigest is returned if a block's mix digest is non-zero.