1 files changed, 7 insertions, 1 deletions
diff --git a/app/services/deployments/update_environment_service.rb b/app/services/deployments/update_environment_service.rb
index 19b950044d0..b0ba8ecaa47 100644
--- a/app/services/deployments/update_environment_service.rb
+++ b/app/services/deployments/update_environment_service.rb
@@ -56,7 +56,13 @@ module Deployments
     end
 
     def expanded_environment_url
-      ExpandVariables.expand(environment_url, -> { variables }) if environment_url
+      return unless environment_url
+
+      if ::Feature.enabled?(:ci_expand_environment_name_and_url, deployment.project, default_enabled: :yaml)
+        ExpandVariables.expand(environment_url, -> { variables.sort_and_expand_all })
+      else
+        ExpandVariables.expand(environment_url, -> { variables })
+      end
     end
 
     def environment_url