diff --git a/roles/confluence_config/tasks/main.yml b/roles/confluence_config/tasks/main.yml
index 1bea153..587c533 100644
--- a/roles/confluence_config/tasks/main.yml
+++ b/roles/confluence_config/tasks/main.yml
@@ -137,8 +137,8 @@
           update plugin_setting set setting_value=regexp_replace(setting_value, %s, %s)
           where namespace = '_GLOBAL' and setting_key = 'atlassian.confluence.settings';
         positional_args:
-          - "\"baseUrl\":.*?,"
-          - "\"baseUrl\":\"{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}{{ atl_tomcat_contextpath }}\","
+          - "\"baseUrl\":.*?(,|})"
+          - "\"baseUrl\":\"{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}{{ atl_tomcat_contextpath }}\"\\1"
       when: atl_product_version is version('10.1', '>=')
 
     # For Confluence < 10.1 - use bandana table with XML format