diff --git a/1.20/scala_2.12-java11-ubuntu/docker-entrypoint.sh b/1.20/scala_2.12-java11-ubuntu/docker-entrypoint.sh
index e081109..1c70f1a 100755
--- a/1.20/scala_2.12-java11-ubuntu/docker-entrypoint.sh
+++ b/1.20/scala_2.12-java11-ubuntu/docker-entrypoint.sh
@@ -108,7 +108,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue
diff --git a/1.20/scala_2.12-java17-ubuntu/docker-entrypoint.sh b/1.20/scala_2.12-java17-ubuntu/docker-entrypoint.sh
index e081109..1c70f1a 100755
--- a/1.20/scala_2.12-java17-ubuntu/docker-entrypoint.sh
+++ b/1.20/scala_2.12-java17-ubuntu/docker-entrypoint.sh
@@ -108,7 +108,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue
diff --git a/1.20/scala_2.12-java8-ubuntu/docker-entrypoint.sh b/1.20/scala_2.12-java8-ubuntu/docker-entrypoint.sh
index e081109..1c70f1a 100755
--- a/1.20/scala_2.12-java8-ubuntu/docker-entrypoint.sh
+++ b/1.20/scala_2.12-java8-ubuntu/docker-entrypoint.sh
@@ -108,7 +108,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue
diff --git a/2.0/scala_2.12-java11-ubuntu/docker-entrypoint.sh b/2.0/scala_2.12-java11-ubuntu/docker-entrypoint.sh
index e081109..1c70f1a 100755
--- a/2.0/scala_2.12-java11-ubuntu/docker-entrypoint.sh
+++ b/2.0/scala_2.12-java11-ubuntu/docker-entrypoint.sh
@@ -108,7 +108,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue
diff --git a/2.0/scala_2.12-java17-ubuntu/docker-entrypoint.sh b/2.0/scala_2.12-java17-ubuntu/docker-entrypoint.sh
index e081109..1c70f1a 100755
--- a/2.0/scala_2.12-java17-ubuntu/docker-entrypoint.sh
+++ b/2.0/scala_2.12-java17-ubuntu/docker-entrypoint.sh
@@ -108,7 +108,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue
diff --git a/2.0/scala_2.12-java21-ubuntu/docker-entrypoint.sh b/2.0/scala_2.12-java21-ubuntu/docker-entrypoint.sh
index e081109..1c70f1a 100755
--- a/2.0/scala_2.12-java21-ubuntu/docker-entrypoint.sh
+++ b/2.0/scala_2.12-java21-ubuntu/docker-entrypoint.sh
@@ -108,7 +108,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue
diff --git a/2.1/scala_2.12-java11-ubuntu/docker-entrypoint.sh b/2.1/scala_2.12-java11-ubuntu/docker-entrypoint.sh
index e081109..1c70f1a 100755
--- a/2.1/scala_2.12-java11-ubuntu/docker-entrypoint.sh
+++ b/2.1/scala_2.12-java11-ubuntu/docker-entrypoint.sh
@@ -108,7 +108,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue
diff --git a/2.1/scala_2.12-java17-ubuntu/docker-entrypoint.sh b/2.1/scala_2.12-java17-ubuntu/docker-entrypoint.sh
index e081109..1c70f1a 100755
--- a/2.1/scala_2.12-java17-ubuntu/docker-entrypoint.sh
+++ b/2.1/scala_2.12-java17-ubuntu/docker-entrypoint.sh
@@ -108,7 +108,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue
diff --git a/2.1/scala_2.12-java21-ubuntu/docker-entrypoint.sh b/2.1/scala_2.12-java21-ubuntu/docker-entrypoint.sh
index e081109..1c70f1a 100755
--- a/2.1/scala_2.12-java21-ubuntu/docker-entrypoint.sh
+++ b/2.1/scala_2.12-java21-ubuntu/docker-entrypoint.sh
@@ -108,7 +108,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue
diff --git a/2.2/scala_2.12-java11-ubuntu/docker-entrypoint.sh b/2.2/scala_2.12-java11-ubuntu/docker-entrypoint.sh
index cf63daa..0af7216 100755
--- a/2.2/scala_2.12-java11-ubuntu/docker-entrypoint.sh
+++ b/2.2/scala_2.12-java11-ubuntu/docker-entrypoint.sh
@@ -101,7 +101,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue
diff --git a/2.2/scala_2.12-java17-ubuntu/docker-entrypoint.sh b/2.2/scala_2.12-java17-ubuntu/docker-entrypoint.sh
index cf63daa..0af7216 100755
--- a/2.2/scala_2.12-java17-ubuntu/docker-entrypoint.sh
+++ b/2.2/scala_2.12-java17-ubuntu/docker-entrypoint.sh
@@ -101,7 +101,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue
diff --git a/2.2/scala_2.12-java21-ubuntu/docker-entrypoint.sh b/2.2/scala_2.12-java21-ubuntu/docker-entrypoint.sh
index cf63daa..0af7216 100755
--- a/2.2/scala_2.12-java21-ubuntu/docker-entrypoint.sh
+++ b/2.2/scala_2.12-java21-ubuntu/docker-entrypoint.sh
@@ -101,7 +101,7 @@ process_flink_properties() {
     local OLD_IFS="$IFS"
     IFS=$'\n'
     for prop in $flink_properties_content; do
-        prop=$(echo $prop | tr -d '[:space:]')
+        prop=$(echo "$prop" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
 
         if [ -z "$prop" ]; then
             continue