diff --git a/Framework/KubernetesWorkflow/K8sNameUtils.cs b/Framework/KubernetesWorkflow/K8sNameUtils.cs
index f620e7df..2c9b1e52 100644
--- a/Framework/KubernetesWorkflow/K8sNameUtils.cs
+++ b/Framework/KubernetesWorkflow/K8sNameUtils.cs
@@ -24,8 +24,8 @@
                 .Replace("]", "-")
                 .Replace(",", "-");
 
-            result = result.Trim('-');
             if (result.Length > maxLength) result = result.Substring(0, maxLength);
+            result = result.Trim('-');
 
             return result;
         }
diff --git a/Framework/Utils/RandomUtils.cs b/Framework/Utils/RandomUtils.cs
index acece431..ae93c413 100644
--- a/Framework/Utils/RandomUtils.cs
+++ b/Framework/Utils/RandomUtils.cs
@@ -3,24 +3,31 @@
     public static class RandomUtils
     {
         private static readonly Random random = new Random();
+        private static readonly object @lock = new object();
 
         public static T PickOneRandom<T>(this List<T> remainingItems)
         {
-            var i = random.Next(0, remainingItems.Count);
-            var result = remainingItems[i];
-            remainingItems.RemoveAt(i);
-            return result;
+            lock (@lock)
+            {
+                var i = random.Next(0, remainingItems.Count);
+                var result = remainingItems[i];
+                remainingItems.RemoveAt(i);
+                return result;
+            }
         }
 
         public static T[] Shuffled<T>(T[] items)
         {
-            var result = new List<T>();
-            var source = items.ToList();
-            while (source.Any())
+            lock (@lock)
             {
-                result.Add(RandomUtils.PickOneRandom(source));
+                var result = new List<T>();
+                var source = items.ToList();
+                while (source.Any())
+                {
+                    result.Add(RandomUtils.PickOneRandom(source));
+                }
+                return result.ToArray();
             }
-            return result.ToArray();
         }
     }
 }