diff --git a/Ansible/ansible/ansible_collections/jfrog/platform/CHANGELOG.md b/Ansible/ansible/ansible_collections/jfrog/platform/CHANGELOG.md
new file mode 100644
index 0000000..58204e7
--- /dev/null
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/CHANGELOG.md
@@ -0,0 +1,14 @@
+# JFrog Platform Ansible Collection Changelog
+All changes to this collection will be documented in this file.
+
+## [7.8.6] - May 10, 2021
+* Fixed broken URLs in ansible galaxy - [108](https://github.com/jfrog/JFrog-Cloud-Installers/issues/108)
+* Added option to configure system.yaml (using `<product>_systemyaml` variable)  and binarystore.xml (using `artifactory_binarystore` variable)
+
+## [7.8.5] - May 3, 2021
+* Added new `jfrog.platform` collection with Artifactory, Distribution, Missioncontrol and Xray roles
+* `jfrog.platform` galaxy [collection] (https://galaxy.ansible.com/jfrog/platform) release
+* Added new `groups_vars/all/package_version.yml` file to define product versions
+* Added global support for masterKey and joinKey values in `groups_vars/all/vars.yml`
+* **IMPORTANT**
+* Previous 1.x.x jfrog.installer [deprecated collection](https://github.com/jfrog/JFrog-Cloud-Installers/tree/ansible-v1.1.2/Ansible/ansible_collections/jfrog/installers) 
diff --git a/Ansible/ansible_collections/jfrog/platform/README.md b/Ansible/ansible/ansible_collections/jfrog/platform/README.md
similarity index 97%
rename from Ansible/ansible_collections/jfrog/platform/README.md
rename to Ansible/ansible/ansible_collections/jfrog/platform/README.md
index 1d24d83..cec9f31 100644
--- a/Ansible/ansible_collections/jfrog/platform/README.md
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/README.md
@@ -8,7 +8,7 @@ This Ansible directory consists of the following directories that support the JF
 
  ## Getting Started
  
- 1. Install this collection from Ansible Galaxy. This collection is also available in RedHat Automation Hub.
+ 1. Install this collection from Ansible Galaxy.
     
     ```
     ansible-galaxy collection install jfrog.platform
@@ -108,5 +108,4 @@ The JFrog Platform Ansible Collection can be installed on the following operatin
 * By default, ansible_python_interpreter: "/usr/bin/python3" used , For Centos/RHEL-7, Set this to "/usr/bin/python" . For example
 ```
 ansible-playbook -vv platform.yml -i hosts.ini -e 'ansible_python_interpreter=/usr/bin/python'
-```
-
+```
\ No newline at end of file
diff --git a/Ansible/ansible_collections/jfrog/platform/ansible.cfg b/Ansible/ansible/ansible_collections/jfrog/platform/ansible.cfg
similarity index 62%
rename from Ansible/ansible_collections/jfrog/platform/ansible.cfg
rename to Ansible/ansible/ansible_collections/jfrog/platform/ansible.cfg
index 5c2352e..d179c81 100644
--- a/Ansible/ansible_collections/jfrog/platform/ansible.cfg
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/ansible.cfg
@@ -2,5 +2,4 @@
 host_key_checking = false
 stdout_callback = debug
 remote_tmp = /tmp/.ansible/tmp
-private_key_file=~/.ssh/ansible-jfrog.key
-timeout = 20
+timeout = 20
\ No newline at end of file
diff --git a/Ansible/ansible_collections/jfrog/platform/artifactory.yml b/Ansible/ansible/ansible_collections/jfrog/platform/artifactory.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/artifactory.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/artifactory.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/distribution.yml b/Ansible/ansible/ansible_collections/jfrog/platform/distribution.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/distribution.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/distribution.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/galaxy.yml b/Ansible/ansible/ansible_collections/jfrog/platform/galaxy.yml
similarity index 89%
rename from Ansible/ansible_collections/jfrog/platform/galaxy.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/galaxy.yml
index c649f5d..96333ca 100644
--- a/Ansible/ansible_collections/jfrog/platform/galaxy.yml
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/galaxy.yml
@@ -9,7 +9,7 @@ namespace: "jfrog"
 name: "platform"
 
 # The version of the collection. Must be compatible with semantic versioning
-version: "7.18.5"
+version: "7.18.6"
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: "README.md"
@@ -53,13 +53,13 @@ tags:
 dependencies: {}
 
 # The URL of the originating SCM repository
-repository: "https://github.com/jfrog/JFrog-Cloud-Installers/Ansible"
+repository: "https://github.com/jfrog/JFrog-Cloud-Installers/tree/master/Ansible"
 
 # The URL to any online docs
-documentation: "https://github.com/jfrog/JFrog-Cloud-Installers/blob/master/Ansible/README.md"
+documentation: "https://github.com/jfrog/JFrog-Cloud-Installers/blob/master/Ansible/ansible_collections/jfrog/platform/README.md"
 
 # The URL to the homepage of the collection/project
-homepage: "https://github.com/jfrog/JFrog-Cloud-Installers/Ansible"
+homepage: "https://github.com/jfrog/JFrog-Cloud-Installers/tree/master/Ansible/ansible_collections/jfrog/platform"
 
 # The URL to the collection issue tracker
 issues: "https://github.com/jfrog/JFrog-Cloud-Installers/issues"
diff --git a/Ansible/ansible_collections/jfrog/platform/group_vars/all/package_version.yml b/Ansible/ansible/ansible_collections/jfrog/platform/group_vars/all/package_version.yml
similarity index 69%
rename from Ansible/ansible_collections/jfrog/platform/group_vars/all/package_version.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/group_vars/all/package_version.yml
index 7000464..473c62f 100644
--- a/Ansible/ansible_collections/jfrog/platform/group_vars/all/package_version.yml
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/group_vars/all/package_version.yml
@@ -1,8 +1,8 @@
 # The version of products to install
-artifactory_version: 7.18.5
+artifactory_version: 7.18.6
 xray_version: 3.24.2
 distribution_version: 2.7.1
 missioncontrol_version: 4.7.3
 
 # platform collection version
-platform_collection_version: 7.18.5
+platform_collection_version: 7.18.6
diff --git a/Ansible/ansible_collections/jfrog/platform/group_vars/all/vars.yml b/Ansible/ansible/ansible_collections/jfrog/platform/group_vars/all/vars.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/group_vars/all/vars.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/group_vars/all/vars.yml
diff --git a/Ansible/ansible/ansible_collections/jfrog/platform/jfrog-platform-7.18.6.tar.gz b/Ansible/ansible/ansible_collections/jfrog/platform/jfrog-platform-7.18.6.tar.gz
new file mode 100644
index 0000000..401e06f
Binary files /dev/null and b/Ansible/ansible/ansible_collections/jfrog/platform/jfrog-platform-7.18.6.tar.gz differ
diff --git a/Ansible/ansible_collections/jfrog/platform/missioncontrol.yml b/Ansible/ansible/ansible_collections/jfrog/platform/missioncontrol.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/missioncontrol.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/missioncontrol.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/platform.yml b/Ansible/ansible/ansible_collections/jfrog/platform/platform.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/platform.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/platform.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/plugins/README.md b/Ansible/ansible/ansible_collections/jfrog/platform/plugins/README.md
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/plugins/README.md
rename to Ansible/ansible/ansible_collections/jfrog/platform/plugins/README.md
diff --git a/Ansible/ansible_collections/jfrog/platform/plugins/callback/README.md b/Ansible/ansible/ansible_collections/jfrog/platform/plugins/callback/README.md
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/plugins/callback/README.md
rename to Ansible/ansible/ansible_collections/jfrog/platform/plugins/callback/README.md
diff --git a/Ansible/ansible_collections/jfrog/platform/postgres.yml b/Ansible/ansible/ansible_collections/jfrog/platform/postgres.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/postgres.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/postgres.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/README.md b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/README.md
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory/README.md
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/README.md
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml
similarity index 65%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml
index db4b5fb..853f884 100644
--- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml
@@ -6,10 +6,13 @@ ansible_marketplace: standalone
 # Set this to true when SSL is enabled (to use artifactory_nginx_ssl role), default to false (implies artifactory uses artifactory_nginx role )
 artifactory_nginx_ssl_enabled: false
 
+# Set this to false when ngnix is disabled, defaults to true (implies artifactory uses artifactory_nginx role )
+artifactory_nginx_enabled: true
+
 # Provide single node license
 # artifactory_single_license:
 
-# Provide individual (HA) licenses file separated by new line and set artifactory_ha_enabled: true.
+# Provide individual (HA) licenses file separated by new line and 2-space indentation and set artifactory_ha_enabled: true.
 # Example:
 # artifactory_licenses: |-
 #   <license_1>
@@ -17,7 +20,7 @@ artifactory_nginx_ssl_enabled: false
 #   <license_2>
 
 #   <license_3>
-  
+
 # To enable HA, set to true
 artifactory_ha_enabled: false
 
@@ -55,3 +58,31 @@ artifactory_upgrade_only: false
 #default username and password
 artifactory_admin_username: admin
 artifactory_admin_password: password
+
+
+# Provide binarystore XML content below with 2-space indentation
+artifactory_binarystore: |-
+  <?xml version="1.0" encoding="UTF-8"?>
+  <config version="2">
+      <chain template="cluster-file-system"/>
+  </config>
+
+# Provide systemyaml content below with 2-space indentation
+artifactory_systemyaml: |-
+  configVersion: 1
+  shared:
+    extraJavaOpts: "{{ artifactory_extra_java_opts }}"
+    node:
+      id: {{ ansible_hostname }}
+      ip: {{ ansible_host }}
+      taskAffinity: {{ artifactory_taskAffinity }}
+      haEnabled: {{ artifactory_ha_enabled }}
+    database:
+      type: "{{ artifactory_db_type }}"
+      driver: "{{ artifactory_db_driver }}"
+      url: "{{ artifactory_db_url }}"
+      username: "{{ artifactory_db_user }}"
+      password: "{{ artifactory_db_password }}"
+  router:
+    entrypoints:
+      internalPort: 8046
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/handlers/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/handlers/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory/handlers/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/handlers/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/meta/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/meta/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory/meta/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/meta/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml
similarity index 98%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml
index 74aec64..ee33f09 100644
--- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml
@@ -5,7 +5,7 @@
 - name: install nginx
   include_role:
     name: artifactory_nginx
-  when: artifactory_nginx_ssl_enabled == false
+  when: artifactory_nginx_enabled == true
 
 - name: install nginx with SSL
   include_role:
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/artifactory.cluster.license.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/artifactory.cluster.license.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/artifactory.cluster.license.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/artifactory.cluster.license.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/artifactory.lic.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/artifactory.lic.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/artifactory.lic.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/artifactory.lic.j2
diff --git a/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/binarystore.xml.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/binarystore.xml.j2
new file mode 100644
index 0000000..50c4625
--- /dev/null
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/binarystore.xml.j2
@@ -0,0 +1,3 @@
+{% if (artifactory_binarystore) and (artifactory_binarystore|length > 0) %}
+{{ artifactory_binarystore }}
+{% endif %}
\ No newline at end of file
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/installer-info.json.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/installer-info.json.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/installer-info.json.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/installer-info.json.j2
diff --git a/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/system.yaml.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/system.yaml.j2
new file mode 100644
index 0000000..fb8c0ed
--- /dev/null
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/system.yaml.j2
@@ -0,0 +1,3 @@
+{% if (artifactory_systemyaml) and (artifactory_systemyaml|length > 0) %}
+{{ artifactory_systemyaml }}
+{% endif %}
\ No newline at end of file
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/README.md b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/README.md
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/README.md
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/README.md
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/defaults/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/defaults/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/defaults/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/defaults/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/files/nginx.conf b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/files/nginx.conf
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/files/nginx.conf
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/files/nginx.conf
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/handlers/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/handlers/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/handlers/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/handlers/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/meta/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/meta/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/meta/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/meta/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/Debian.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/Debian.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/Debian.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/Debian.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/RedHat.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/RedHat.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/RedHat.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/RedHat.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/templates/artifactory.conf.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/templates/artifactory.conf.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/templates/artifactory.conf.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/templates/artifactory.conf.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/vars/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/vars/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/vars/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/vars/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/README.md b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/README.md
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/README.md
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/README.md
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/defaults/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/defaults/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/defaults/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/defaults/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/handlers/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/handlers/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/handlers/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/handlers/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/meta/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/meta/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/meta/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/meta/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/tasks/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/tasks/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/tasks/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/tasks/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/artifactory.conf.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/artifactory.conf.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/artifactory.conf.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/artifactory.conf.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/certificate.key.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/certificate.key.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/certificate.key.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/certificate.key.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/certificate.pem.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/certificate.pem.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/certificate.pem.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/certificate.pem.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/vars/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/vars/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/vars/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/vars/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/README.md b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/README.md
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/README.md
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/README.md
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml
similarity index 67%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml
index 31e2c0a..1fc0c31 100644
--- a/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml
@@ -41,3 +41,26 @@ distribution_redis_password: password
 distribution_upgrade_only: false
 
 distribution_system_yaml_template: system.yaml.j2
+
+# Provide systemyaml content below with 2-space indentation
+distribution_systemyaml: |-
+  configVersion: 1
+  shared:
+    jfrogUrl: {{ jfrog_url }}
+    node:
+      ip: {{ ansible_host }}
+      id: {{ ansible_hostname }}
+    database:
+      type: "{{ distribution_db_type }}"
+      driver: "{{ distribution_db_driver }}"
+      url: "{{ distribution_db_url }}"
+      username: "{{ distribution_db_user }}"
+      password: "{{ distribution_db_password }}"
+    redis:
+      connectionString: "{{ distribution_redis_url }}"
+      password: "{{ distribution_redis_password }}"
+    security:
+      joinKey: {{ join_key }}
+  router:
+    entrypoints:
+      internalPort: 8046
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/handlers/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/handlers/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/handlers/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/handlers/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/meta/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/meta/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/meta/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/meta/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/expect.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/expect.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/expect.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/expect.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/install.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/install.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/install.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/install.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/upgrade.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/upgrade.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/upgrade.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/upgrade.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/templates/installer-info.json.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/templates/installer-info.json.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/templates/installer-info.json.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/templates/installer-info.json.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/templates/redis.conf.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/templates/redis.conf.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/templates/redis.conf.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/templates/redis.conf.j2
diff --git a/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/templates/system.yaml.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/templates/system.yaml.j2
new file mode 100644
index 0000000..a4cfba4
--- /dev/null
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/templates/system.yaml.j2
@@ -0,0 +1,3 @@
+{% if (distribution_systemyaml) and (distribution_systemyaml|length > 0) %}
+{{ distribution_systemyaml }}
+{% endif %}
\ No newline at end of file
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/script/archive.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/vars/script/archive.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/script/archive.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/vars/script/archive.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/README.md b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/README.md
similarity index 97%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/README.md
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/README.md
index 2f0e3ce..05734ec 100644
--- a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/README.md
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/README.md
@@ -1,4 +1,4 @@
-# MissionControl
+# Missioncontrol
 The missioncontrol role will install missioncontrol software onto the host. An Artifactory server and Postgress database is required.
 
 ### Role Variables
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/defaults/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/defaults/main.yml
similarity index 60%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/defaults/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/defaults/main.yml
index f1bd22b..22940bd 100644
--- a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/defaults/main.yml
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/defaults/main.yml
@@ -56,3 +56,41 @@ flow_type: archive
 mc_upgrade_only: false
 
 mc_system_yaml_template: system.yaml.j2
+
+# Provide systemyaml content below with 2-space indentation
+mc_systemyaml: |-
+  configVersion: 1
+  shared:
+    jfrogUrl: {{ jfrog_url }}
+    node:
+      ip: {{ ansible_host }}
+      id: {{ ansible_hostname }}
+    database:
+      type: "{{ mc_db_type }}"
+      driver: "{{ mc_db_driver }}"
+      url: "{{ mc_db_url }}"
+    elasticsearch:
+      unicastFile: {{ mc_es_conf_base }}/config/unicast_hosts.txt
+      password: {{ mc_es_password }}
+      url: {{ mc_es_url }}
+      username: {{ mc_es_user }}
+    security:
+      joinKey: {{ join_key }}
+  mc:
+    database:
+      username: "{{ mc_db_user }}"
+      password: "{{ mc_db_password }}"
+      schema: "jfmc_server"
+  insight-scheduler:
+    database:
+      username: "{{ mc_db_user }}"
+      password: "{{ mc_db_password }}"
+      schema: "insight_scheduler"
+  insight-server:
+    database:
+      username: "{{ mc_db_user }}"
+      password: "{{ mc_db_password }}"
+      schema: "insight_server"
+  router:
+    entrypoints:
+      internalPort: 8046
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/localhost.key b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/localhost.key
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/localhost.key
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/localhost.key
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/localhost.pem b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/localhost.pem
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/localhost.pem
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/localhost.pem
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/root-ca.pem b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/root-ca.pem
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/root-ca.pem
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/root-ca.pem
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/sg_roles.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/sg_roles.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/sg_roles.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/sg_roles.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/sg_roles_mapping.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/sg_roles_mapping.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/sg_roles_mapping.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/sg_roles_mapping.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/sgadmin.key b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/sgadmin.key
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/sgadmin.key
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/sgadmin.key
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/sgadmin.pem b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/sgadmin.pem
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/files/searchguard/sgadmin.pem
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/files/searchguard/sgadmin.pem
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/handlers/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/handlers/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/handlers/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/handlers/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/meta/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/meta/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/meta/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/meta/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/expect.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/expect.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/expect.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/expect.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/install.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/install.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/install.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/install.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/setup-elasticsearch.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/setup-elasticsearch.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/setup-elasticsearch.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/setup-elasticsearch.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/setup-searchguard.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/setup-searchguard.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/setup-searchguard.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/setup-searchguard.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/upgrade-elasticsearch.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/upgrade-elasticsearch.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/upgrade-elasticsearch.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/upgrade-elasticsearch.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/upgrade-searchguard.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/upgrade-searchguard.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/upgrade-searchguard.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/upgrade-searchguard.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/upgrade.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/upgrade.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/tasks/upgrade.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/upgrade.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/elasticsearch.yml.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/elasticsearch.yml.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/elasticsearch.yml.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/elasticsearch.yml.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/ha/master.elasticsearch.yml.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/ha/master.elasticsearch.yml.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/ha/master.elasticsearch.yml.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/ha/master.elasticsearch.yml.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/ha/master.system.yaml.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/ha/master.system.yaml.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/ha/master.system.yaml.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/ha/master.system.yaml.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/ha/slave.elasticsearch.yml.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/ha/slave.elasticsearch.yml.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/ha/slave.elasticsearch.yml.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/ha/slave.elasticsearch.yml.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/ha/slave.system.yaml.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/ha/slave.system.yaml.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/ha/slave.system.yaml.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/ha/slave.system.yaml.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/installer-info.json.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/installer-info.json.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/installer-info.json.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/installer-info.json.j2
diff --git a/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/system.yaml.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/system.yaml.j2
new file mode 100644
index 0000000..5c51aae
--- /dev/null
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/system.yaml.j2
@@ -0,0 +1,3 @@
+{% if (mc_systemyaml) and (mc_systemyaml|length > 0) %}
+{{ mc_systemyaml }}
+{% endif %}
\ No newline at end of file
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/vars/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/vars/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/vars/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/vars/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/vars/script/archive.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/vars/script/archive.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/missionControl/vars/script/archive.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/vars/script/archive.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/README.md b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/README.md
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/README.md
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/README.md
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/handlers/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/handlers/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/handlers/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/handlers/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/meta/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/meta/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/meta/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/meta/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/Debian.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/Debian.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/Debian.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/Debian.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/RedHat.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/RedHat.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/RedHat.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/RedHat.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/templates/pg_hba.conf.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/templates/pg_hba.conf.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/templates/pg_hba.conf.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/templates/pg_hba.conf.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/templates/postgres.sh.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/templates/postgres.sh.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/templates/postgres.sh.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/templates/postgres.sh.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/templates/postgresql.conf.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/templates/postgresql.conf.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/templates/postgresql.conf.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/templates/postgresql.conf.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/vars/Debian.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/vars/Debian.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/vars/Debian.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/vars/Debian.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/vars/RedHat.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/vars/RedHat.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/postgres/vars/RedHat.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/postgres/vars/RedHat.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/README.md b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/README.md
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/README.md
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/README.md
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml
similarity index 74%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml
index c57c008..afafb02 100644
--- a/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml
@@ -75,3 +75,30 @@ yum_python_interpreter: >-
     {%- else -%}
         /usr/bin/python3
     {%- endif -%}
+
+# Provide systemyaml content below with 2-space indentation
+xray_systemyaml: |-
+  configVersion: 1
+  shared:
+    jfrogUrl: {{ jfrog_url }}
+    node:
+      ip: {{ ansible_host }}
+      id: {{ ansible_hostname }}
+    database:
+      type: "{{ xray_db_type }}"
+      driver: "{{ xray_db_driver }}"
+      url: "{{ xray_db_url }}"
+      username: "{{ xray_db_user }}"
+      password: "{{ xray_db_password }}"
+    rabbitMq:
+      autoStop: true
+      erlangCookie:
+        value: "{{ xray_rabbitmq_default_cookie }}"
+      url: "{{ xray_rabbitmq_url }}"
+      username: "{{ xray_rabbitmq_user }}"
+      password: "{{xray_rabbitmq_password }}"
+    security:
+      joinKey: {{ join_key }}
+  router:
+    entrypoints:
+      internalPort: 8046
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/handlers/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/handlers/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/handlers/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/handlers/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/meta/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/meta/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/meta/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/meta/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/expect.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/expect.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/expect.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/expect.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/install.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/install.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/install.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/install.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/check/archive.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/check/archive.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/check/archive.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/check/archive.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/RedHat.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/RedHat.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/RedHat.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/RedHat.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/status/archive.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/status/archive.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/status/archive.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/status/archive.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/Debian.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/Debian.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/Debian.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/Debian.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/RedHat.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/RedHat.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/RedHat.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/RedHat.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/upgrade.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/upgrade.yml
similarity index 98%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/upgrade.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/upgrade.yml
index 31279b4..3db9b00 100644
--- a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/upgrade.yml
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/tasks/upgrade.yml
@@ -5,7 +5,7 @@
 - name: stop xray
   become: yes
   systemd:
-    name: "{{ xray_daemon }}"
+    name: "{{ xray_daemon }}"   
     state: stopped
 
 - name: download xray for upgrade
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/templates/installer-info.json.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/templates/installer-info.json.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/templates/installer-info.json.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/templates/installer-info.json.j2
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/templates/rabbitmq.conf.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/templates/rabbitmq.conf.j2
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/templates/rabbitmq.conf.j2
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/templates/rabbitmq.conf.j2
diff --git a/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/templates/system.yaml.j2 b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/templates/system.yaml.j2
new file mode 100644
index 0000000..78b6d6a
--- /dev/null
+++ b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/templates/system.yaml.j2
@@ -0,0 +1,3 @@
+{% if (xray_systemyaml) and (xray_systemyaml|length > 0) %}
+{{ xray_systemyaml }}
+{% endif %}
\ No newline at end of file
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/script/archive.yml b/Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/vars/script/archive.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/roles/xray/vars/script/archive.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/vars/script/archive.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/xray.yml b/Ansible/ansible/ansible_collections/jfrog/platform/xray.yml
similarity index 100%
rename from Ansible/ansible_collections/jfrog/platform/xray.yml
rename to Ansible/ansible/ansible_collections/jfrog/platform/xray.yml
diff --git a/Ansible/examples/inventory/platform/hosts.ini b/Ansible/ansible/examples/inventory/platform/hosts.ini
similarity index 100%
rename from Ansible/examples/inventory/platform/hosts.ini
rename to Ansible/ansible/examples/inventory/platform/hosts.ini
diff --git a/Ansible/examples/inventory/rt-xray/hosts.ini b/Ansible/ansible/examples/inventory/rt-xray/hosts.ini
similarity index 100%
rename from Ansible/examples/inventory/rt-xray/hosts.ini
rename to Ansible/ansible/examples/inventory/rt-xray/hosts.ini
diff --git a/Ansible/examples/inventory/rt/hosts.ini b/Ansible/ansible/examples/inventory/rt/hosts.ini
similarity index 100%
rename from Ansible/examples/inventory/rt/hosts.ini
rename to Ansible/ansible/examples/inventory/rt/hosts.ini
diff --git a/Ansible/examples/inventory/xray/hosts.ini b/Ansible/ansible/examples/inventory/xray/hosts.ini
similarity index 100%
rename from Ansible/examples/inventory/xray/hosts.ini
rename to Ansible/ansible/examples/inventory/xray/hosts.ini
diff --git a/Ansible/examples/playbook-platform.yml b/Ansible/ansible/examples/playbook-platform.yml
similarity index 88%
rename from Ansible/examples/playbook-platform.yml
rename to Ansible/ansible/examples/playbook-platform.yml
index f9c6f0e..e25d675 100644
--- a/Ansible/examples/playbook-platform.yml
+++ b/Ansible/ansible/examples/playbook-platform.yml
@@ -23,8 +23,8 @@
   roles:
     - distribution
 
-- hosts: missioncontrol_servers
+- hosts: missionControl_servers
   collections:
     - jfrog.platform
   roles:
-    - missioncontrol
+    - missionControl
diff --git a/Ansible/examples/playbook-rt-xray.yml b/Ansible/ansible/examples/playbook-rt-xray.yml
similarity index 100%
rename from Ansible/examples/playbook-rt-xray.yml
rename to Ansible/ansible/examples/playbook-rt-xray.yml
diff --git a/Ansible/examples/playbook-rt.yml b/Ansible/ansible/examples/playbook-rt.yml
similarity index 100%
rename from Ansible/examples/playbook-rt.yml
rename to Ansible/ansible/examples/playbook-rt.yml
diff --git a/Ansible/examples/playbook-xray.yml b/Ansible/ansible/examples/playbook-xray.yml
similarity index 100%
rename from Ansible/examples/playbook-xray.yml
rename to Ansible/ansible/examples/playbook-xray.yml
diff --git a/Ansible/ansible_collections/jfrog/platform/jfrog-platform-7.18.5.tar.gz b/Ansible/ansible_collections/jfrog/platform/jfrog-platform-7.18.5.tar.gz
deleted file mode 100644
index c565760..0000000
Binary files a/Ansible/ansible_collections/jfrog/platform/jfrog-platform-7.18.5.tar.gz and /dev/null differ
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/binarystore.xml.j2 b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/binarystore.xml.j2
deleted file mode 100644
index a06e211..0000000
--- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/binarystore.xml.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config version="2">
-    <chain template="cluster-file-system"/>
-</config>
\ No newline at end of file
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/system.yaml.j2 b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/system.yaml.j2
deleted file mode 100644
index 876afd5..0000000
--- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/system.yaml.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-configVersion: 1
-shared:
-  extraJavaOpts: "{{ artifactory_extra_java_opts }}"
-  node:
-    id: {{ ansible_date_time.iso8601_micro | to_uuid }}
-    ip: {{ ansible_host }}
-    taskAffinity: {{ artifactory_taskAffinity }}
-    haEnabled: {{ artifactory_ha_enabled }}
-  database:
-    type: "{{ artifactory_db_type }}"
-    driver: "{{ artifactory_db_driver }}"
-    url: "{{ artifactory_db_url }}"
-    username: "{{ artifactory_db_user }}"
-    password: "{{ artifactory_db_password }}"
-router:
-  entrypoints:
-    internalPort: 8046
\ No newline at end of file
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/templates/system.yaml.j2 b/Ansible/ansible_collections/jfrog/platform/roles/distribution/templates/system.yaml.j2
deleted file mode 100644
index 79fa4a7..0000000
--- a/Ansible/ansible_collections/jfrog/platform/roles/distribution/templates/system.yaml.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-configVersion: 1
-shared:
-  jfrogUrl: {{ jfrog_url }}
-  node:
-    ip: {{ ansible_host }}
-    id: {{ ansible_date_time.iso8601_micro | to_uuid }}
-  database:
-    type: "{{ distribution_db_type }}"
-    driver: "{{ distribution_db_driver }}"
-    url: "{{ distribution_db_url }}"
-    username: "{{ distribution_db_user }}"
-    password: "{{ distribution_db_password }}"
-  redis:
-    connectionString: "{{ distribution_redis_url }}"
-    password: "{{ distribution_redis_password }}"
-  security:
-    joinKey: {{ join_key }}
-router:
-  entrypoints:
-    internalPort: 8046
\ No newline at end of file
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/system.yaml.j2 b/Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/system.yaml.j2
deleted file mode 100644
index d6b3b33..0000000
--- a/Ansible/ansible_collections/jfrog/platform/roles/missionControl/templates/system.yaml.j2
+++ /dev/null
@@ -1,35 +0,0 @@
-configVersion: 1
-shared:
-  jfrogUrl: {{ jfrog_url }}
-  node:
-    ip: {{ mc_primary_ip }}
-    id: {{ ansible_date_time.iso8601_micro | to_uuid }}
-  database:
-    type: "{{ mc_db_type }}"
-    driver: "{{ mc_db_driver }}"
-    url: "{{ mc_db_url }}"
-  elasticsearch:
-    unicastFile: {{ mc_es_conf_base }}/config/unicast_hosts.txt
-    password: {{ mc_es_password }}
-    url: {{ mc_es_url }}
-    username: {{ mc_es_user }}
-  security:
-    joinKey: {{ join_key }}
-mc:
-  database:
-    username: "{{ mc_db_user }}"
-    password: "{{ mc_db_password }}"
-    schema: "jfmc_server"
-insight-scheduler:
-  database:
-    username: "{{ mc_db_user }}"
-    password: "{{ mc_db_password }}"
-    schema: "insight_scheduler"
-insight-server:
-  database:
-    username: "{{ mc_db_user }}"
-    password: "{{ mc_db_password }}"
-    schema: "insight_server"
-router:
-  entrypoints:
-    internalPort: 8046
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/templates/system.yaml.j2 b/Ansible/ansible_collections/jfrog/platform/roles/xray/templates/system.yaml.j2
deleted file mode 100644
index e51192b..0000000
--- a/Ansible/ansible_collections/jfrog/platform/roles/xray/templates/system.yaml.j2
+++ /dev/null
@@ -1,24 +0,0 @@
-configVersion: 1
-shared:
-  jfrogUrl: {{ jfrog_url }}
-  node:
-    ip: {{ ansible_host }}
-    id: {{ ansible_date_time.iso8601_micro | to_uuid }}
-  database:
-    type: "{{ xray_db_type }}"
-    driver: "{{ xray_db_driver }}"
-    url: "{{ xray_db_url }}"
-    username: "{{ xray_db_user }}"
-    password: "{{ xray_db_password }}"
-  rabbitMq:
-    autoStop: true
-    erlangCookie:
-      value: "{{ xray_rabbitmq_default_cookie }}"
-    url: "{{ xray_rabbitmq_url }}"
-    username: "{{ xray_rabbitmq_user }}"
-    password: "{{xray_rabbitmq_password }}"
-  security:
-    joinKey: {{ join_key }}
-router:
-  entrypoints:
-    internalPort: 8046
\ No newline at end of file