diff --git a/terraform/batch.tf b/terraform/batch.tf
index 27a6a033..fd812d79 100644
--- a/terraform/batch.tf
+++ b/terraform/batch.tf
@@ -114,7 +114,11 @@ resource "aws_batch_job_definition" "calcloud" {
   container_properties = <<CONTAINER_PROPERTIES
   {
     "command": ["Ref::command", "Ref::dataset", "Ref::input_path", "Ref::s3_output_path", "Ref::crds_config"],
-    "environment": [],
+    "environment": [
+      {"name": "AWSDPVER", "value": "${var.awsdpver}"},
+      {"name": "AWSYSVER", "value": "${var.awsysver}"},
+      {"name": "CSYS_VER", "value": "${var.csys_ver}"}
+    ],
     "image": "${aws_ecr_repository.caldp_ecr.repository_url}:${data.aws_ecr_image.caldp_latest.image_tag}",
     "jobRoleArn": "${data.aws_ssm_parameter.batch_job_role.value}",
     "memory": 2560,
diff --git a/terraform/deploy.sh b/terraform/deploy.sh
index 2bccdc89..8ec34cdf 100755
--- a/terraform/deploy.sh
+++ b/terraform/deploy.sh
@@ -3,8 +3,8 @@
 # ADMIN_ARN is set in the ci node env and should not be included in this deploy script
 
 # variables that will likely be changed frequently
-CALCLOUD_VER="0.2.0"
-CALDP_VER="0.1.2"
+CALCLOUD_VER="0.2.1"
+CALDP_VER="0.1.3"
 CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_20201208_DRZ_final"
 # this is the tag that the image will have in AWS ECR
 CALDP_IMAGE_TAG="latest"
@@ -62,7 +62,7 @@ docker push ${CALDP_DOCKER_IMAGE}
 # deploy rest of terraform
 cd ../calcloud-${CALCLOUD_VER}/terraform
 # manual confirmation required
-awsudo $ADMIN_ARN terraform apply
+awsudo $ADMIN_ARN terraform apply -var "awsysver=${CALCLOUD_VER}" -var "awsdpver=${CALDP_VER}" -var "csys_ver=${CAL_BASE_IMAGE##*:}"
 
 # make sure needed prefixes exist in primary s3 bucket
 # pulls the bucket name in from a tag called Name
diff --git a/terraform/lambda_batch_events.tf b/terraform/lambda_batch_events.tf
index 8eb5bbd5..568e390b 100644
--- a/terraform/lambda_batch_events.tf
+++ b/terraform/lambda_batch_events.tf
@@ -8,6 +8,7 @@ module "calcloud_lambda_batchEvents" {
   runtime       = "python3.6"
   publish       = false
   timeout       = 900
+  cloudwatch_logs_retention_in_days = 30
 
   source_path = [
     {
diff --git a/terraform/lambda_blackboard.tf b/terraform/lambda_blackboard.tf
index 3e12e8d6..6c43d3c5 100644
--- a/terraform/lambda_blackboard.tf
+++ b/terraform/lambda_blackboard.tf
@@ -8,6 +8,7 @@ module "calcloud_lambda_blackboard" {
   runtime       = "python3.6"
   publish       = false
   timeout       = 300
+  cloudwatch_logs_retention_in_days = 30
 
   source_path = [
     {
diff --git a/terraform/lambda_broadcast.tf b/terraform/lambda_broadcast.tf
index f8874034..83973cca 100644
--- a/terraform/lambda_broadcast.tf
+++ b/terraform/lambda_broadcast.tf
@@ -8,6 +8,7 @@ module "calcloud_lambda_broadcast" {
   runtime       = "python3.6"
   publish       = false
   timeout       = 300
+  cloudwatch_logs_retention_in_days = 30
 
   source_path = [
     {
diff --git a/terraform/lambda_job_delete.tf b/terraform/lambda_job_delete.tf
index 058efb9b..e332a123 100644
--- a/terraform/lambda_job_delete.tf
+++ b/terraform/lambda_job_delete.tf
@@ -8,6 +8,7 @@ module "calcloud_lambda_deleteJob" {
   runtime       = "python3.6"
   publish       = false
   timeout       = 900
+  cloudwatch_logs_retention_in_days = 30
 
   source_path = [
     {
diff --git a/terraform/lambda_job_rescue.tf b/terraform/lambda_job_rescue.tf
index 52193c8c..91527cd1 100644
--- a/terraform/lambda_job_rescue.tf
+++ b/terraform/lambda_job_rescue.tf
@@ -8,6 +8,7 @@ module "calcloud_lambda_rescueJob" {
   runtime       = "python3.6"
   publish       = false
   timeout       = 900
+  cloudwatch_logs_retention_in_days = 30
 
   source_path = [
     {
diff --git a/terraform/lambda_job_submit.tf b/terraform/lambda_job_submit.tf
index 1b839d1f..e8aaa55a 100644
--- a/terraform/lambda_job_submit.tf
+++ b/terraform/lambda_job_submit.tf
@@ -8,6 +8,7 @@ module "calcloud_lambda_submit" {
   runtime       = "python3.6"
   publish       = false
   timeout       = 900
+  cloudwatch_logs_retention_in_days = 30
 
   source_path = [
     {
diff --git a/terraform/lambda_refresh_cache_logging.tf b/terraform/lambda_refresh_cache_logging.tf
index 6be82a30..2372fc47 100644
--- a/terraform/lambda_refresh_cache_logging.tf
+++ b/terraform/lambda_refresh_cache_logging.tf
@@ -8,6 +8,7 @@ module "calcloud_lambda_refreshCache" {
   runtime       = "python3.6"
   publish       = false
   timeout       = 900
+  cloudwatch_logs_retention_in_days = 30
 
   source_path = [
     {
diff --git a/terraform/variables.tf b/terraform/variables.tf
index d02f0ad7..ff267611 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -14,3 +14,21 @@ variable region {
   type = string
   default = "us-east-1"
 }
+
+variable awsdpver {
+  description = "HST keyword for caldp repo tag version"
+  type = string
+  default = "undefined"
+}
+
+variable awsysver {
+  description = "HST keyword for calcloud repo tag version"
+  type = string
+  default = "undefined"
+}
+
+variable csys_ver {
+  description = "HST keyword for docker base calibration image tag"
+  type = string
+  default = "undefined"
+}