diff --git a/roles/confluence_config/tasks/main.yml b/roles/confluence_config/tasks/main.yml
index e086d09..c20a1dc 100644
--- a/roles/confluence_config/tasks/main.yml
+++ b/roles/confluence_config/tasks/main.yml
@@ -108,8 +108,9 @@
       where bandanacontext = '_GLOBAL' and bandanakey = 'atlassian.confluence.settings';
     positional_args:
       - "<baseUrl>.*</baseUrl>"
-      - "<baseUrl>{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}</baseUrl>"
+      - "<baseUrl>{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}{{ atl_tomcat_contextpath }}</baseUrl>"
   when:
     - atl_proxy_name is defined
     - atl_tomcat_scheme is defined
+    - not db_created.changed
   ignore_errors: yes  # For Molecule as it has no db test framework included
diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml
index b5b987c..5062080 100644
--- a/roles/crowd_config/tasks/main.yml
+++ b/roles/crowd_config/tasks/main.yml
@@ -91,3 +91,20 @@
     owner: "{{ atl_product_user }}"
     group: "{{ atl_product_user }}"
   changed_when: false  # For Molecule idempotence check
+
+- name: Assert baseurl to same as atl_proxy_name
+  postgresql_query:
+    login_host: "{{ atl_db_host }}"
+    login_user: "{{ atl_jdbc_user }}"
+    login_password: "{{ atl_jdbc_password }}"
+    db: "{{ atl_jdbc_db_name }}"
+    query: >
+      update cwd_property set property_value=%s
+      where property_name = 'base.url'
+    positional_args:
+      - "{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}{{ atl_tomcat_contextpath }}/crowd"
+  when:
+    - atl_proxy_name is defined
+    - atl_tomcat_scheme is defined
+    - not db_created.changed
+  ignore_errors: yes  # For Molecule as it has no db test framework included
diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index cfa0bb6..de2d9d3 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -87,3 +87,20 @@
     - "{{ atl_product_installation_versioned }}/temp"
     - "{{ atl_product_installation_versioned }}/work"
   changed_when: false  # For Molecule idempotence check
+
+- name: Assert baseurl to same as atl_proxy_name
+  postgresql_query:
+    login_host: "{{ atl_db_host }}"
+    login_user: "{{ atl_jdbc_user }}"
+    login_password: "{{ atl_jdbc_password }}"
+    db: "{{ atl_jdbc_db_name }}"
+    query: >
+      update propertystring set propertyvalue=%s
+      where id=(select id from propertyentry where property_key = 'jira.baseurl')
+    positional_args:
+      - "{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}{{ atl_tomcat_contextpath }}"
+  when:
+    - atl_proxy_name is defined
+    - atl_tomcat_scheme is defined
+    - not db_created.changed
+  ignore_errors: yes  # For Molecule as it has no db test framework included