diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85770dc..a25793b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [5.0.1] - 2023-12-05
+### Added
+- Added `HADOOP_USER_NAME` environment variable and set it to `beekeeper` 
+
 ## [5.0.0] - 2023-11-16
 ### Changed
 - Upgdate k8s API to work with 2.x version:
diff --git a/k8s-metadata-cleanup.tf b/k8s-metadata-cleanup.tf
index 813390f..823e65c 100644
--- a/k8s-metadata-cleanup.tf
+++ b/k8s-metadata-cleanup.tf
@@ -98,6 +98,11 @@ resource "kubernetes_deployment_v1" "beekeeper_metadata_cleanup" {
             name  = local.spring_application_json_key
             value = data.template_file.beekeeper_metadata_cleanup_config.rendered
           }
+
+          env {
+            name = "HADOOP_USER_NAME"
+            value = "beekeeper"
+          }
         }
         image_pull_secrets {
           name = var.docker_registry_secret_name
diff --git a/k8s-path-cleanup.tf b/k8s-path-cleanup.tf
index acd98c8..51b9ff1 100644
--- a/k8s-path-cleanup.tf
+++ b/k8s-path-cleanup.tf
@@ -99,6 +99,11 @@ resource "kubernetes_deployment_v1" "beekeeper_path_cleanup" {
             name  = local.spring_application_json_key
             value = data.template_file.beekeeper_path_cleanup_config.rendered
           }
+
+          env {
+            name = "HADOOP_USER_NAME"
+            value = "beekeeper"
+          }
         }
         image_pull_secrets {
           name = var.docker_registry_secret_name
diff --git a/k8s-scheduler-apiary.tf b/k8s-scheduler-apiary.tf
index bad4746..3631122 100644
--- a/k8s-scheduler-apiary.tf
+++ b/k8s-scheduler-apiary.tf
@@ -98,6 +98,11 @@ resource "kubernetes_deployment_v1" "beekeeper_scheduler_apiary" {
             name  = local.spring_application_json_key
             value = data.template_file.beekeeper_scheduler_apiary_config.rendered
           }
+
+          env {
+            name = "HADOOP_USER_NAME"
+            value = "beekeeper"
+          }
         }
         image_pull_secrets {
           name = var.docker_registry_secret_name