diff --git a/.github/workflows/pull-request-ephemeral-deploy.yml b/.github/workflows/pull-request-ephemeral-deploy.yml
index 164e567..5111502 100644
--- a/.github/workflows/pull-request-ephemeral-deploy.yml
+++ b/.github/workflows/pull-request-ephemeral-deploy.yml
@@ -1,4 +1,4 @@
-name: Deploy Sandbox Environment
+name: Deploy Ephemeral Sandbox Environment
 
 on:
   pull_request:
diff --git a/terragrunt.hcl b/terragrunt.hcl
index 346401b..e6c44b8 100644
--- a/terragrunt.hcl
+++ b/terragrunt.hcl
@@ -19,7 +19,7 @@ locals {
   dynamodb_table           = "${local.name_dash}-${local.region}-${local.name_hash}-tflocks"
   repo_name                = basename(abspath("${get_path_to_repo_root()}"))
   state_filename_ephemeral = "${local.account_name}/${coalesce(local.git_branch, local.current_user)}/${local.environment_instance}/terraform.tfstate"
-  state_filename_persist   = "${local.account_name}/${coalesce(local.git_branch, local.current_user)}/${local.environment_instance}/terraform.tfstate"
+  state_filename_persist   = "${local.account_name}/${local.environment_instance}/terraform.tfstate"
 }
 
 # Generate the AWS provider settings
@@ -34,6 +34,7 @@ provider "aws" {
     tags = {
       Organization = var.organization_tag
       Repository = coalesce(var.repository_tag, "${basename(abspath(dirname(find_in_parent_folders("terragrunt.hcl"))))}")
+      Branch = var.branch_tag
       CommitHash = var.commit_hash_tag
     }
   }
@@ -47,6 +48,7 @@ provider "aws" {
     tags = {
       Organization = var.organization_tag
       Repository = coalesce(var.repository_tag, "${basename(abspath(dirname(find_in_parent_folders("terragrunt.hcl"))))}")
+      Branch = var.branch_tag
       CommitHash = var.commit_hash_tag
     }
   }
@@ -62,6 +64,11 @@ variable "repository_tag" {
   default = ""
 }
 
+variable "branch_tag" {
+  type = string
+  default = "RUN OUTSIDE PIPELINE"
+}
+
 variable "commit_hash_tag" {
   type = string
   default = "RUN OUTSIDE PIPELINE"