diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index d276b48..85703a2 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -52,10 +52,7 @@ icat_url: "{{ ansible_fqdn }}"
 # IDS server URL
 ids_url: "{{ ansible_fqdn }}"
 
-# TopCat server URL
-topcat_url: "{{ ansible_fqdn }}"
-
-# TopCat database hostname, database name, username and password
+# DataGateway Download API database hostname, database name, username and password
 db_topcat_hostname: "localhost"
 topcat_database: "{{ vault_topcat_database }}"
 db_topcat_username: "{{ vault_db_topcat_username }}"
diff --git a/hosts_all.yml b/hosts_all.yml
index 619075a..5266bf5 100644
--- a/hosts_all.yml
+++ b/hosts_all.yml
@@ -17,5 +17,5 @@
     - role: icat_server
     - role: ids_storage_file
     - role: ids_server
-    - role: topcat
+    - role: datagateway_download_api
     - role: dev_common
diff --git a/icat_test_hosts.yml b/icat_test_hosts.yml
index 1b2aa49..b135a3c 100644
--- a/icat_test_hosts.yml
+++ b/icat_test_hosts.yml
@@ -15,4 +15,4 @@
     - role: icat_server
     - role: ids_storage_file
     - role: ids_server
-    - role: topcat
+    - role: datagateway_download_api
diff --git a/roles/datagateway_download_api/defaults/main.yml b/roles/datagateway_download_api/defaults/main.yml
new file mode 100644
index 0000000..c84b297
--- /dev/null
+++ b/roles/datagateway_download_api/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+
+datagateway_download_api_version: '3.0.1'
diff --git a/roles/topcat/files/logback.xml b/roles/datagateway_download_api/files/logback.xml
similarity index 84%
rename from roles/topcat/files/logback.xml
rename to roles/datagateway_download_api/files/logback.xml
index b816415..8946664 100644
--- a/roles/topcat/files/logback.xml
+++ b/roles/datagateway_download_api/files/logback.xml
@@ -3,9 +3,9 @@
 
         <appender name="FILE"
                 class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${HOME}/logs/topcat.log</file>
+                <file>${HOME}/logs/datagateway-download-api.log</file>
                 <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                        <fileNamePattern>${HOME}/logs/topcat.log.%d{yyyy-MM-dd}.%i.zip
+                        <fileNamePattern>${HOME}/logs/datagateway-download-api.log.%d{yyyy-MM-dd}.%i.zip
                         </fileNamePattern>
                         <maxHistory>30</maxHistory>
                         <timeBasedFileNamingAndTriggeringPolicy
diff --git a/roles/topcat/handlers/topcat-handler.yml b/roles/datagateway_download_api/handlers/datagateway_download_api-handler.yml
similarity index 72%
rename from roles/topcat/handlers/topcat-handler.yml
rename to roles/datagateway_download_api/handlers/datagateway_download_api-handler.yml
index 8177dde..166befd 100644
--- a/roles/topcat/handlers/topcat-handler.yml
+++ b/roles/datagateway_download_api/handlers/datagateway_download_api-handler.yml
@@ -3,8 +3,8 @@
 - name: 'Import: Check payara is running'
   import_tasks: "{{ role_path }}/../payara/tasks/status.yml"
 
-- name: 'Re-install topcat'
-  shell: 'su -l {{ payara_user }} -c "cd /home/{{ payara_user }}/install/topcat; python2 setup -vv install"'
+- name: 'Re-install datagateway-download-api'
+  shell: 'su -l {{ payara_user }} -c "cd /home/{{ payara_user }}/install/datagateway-download-api; ./setup -vv install"'
   become: true
   become_user: root
   args:
diff --git a/roles/datagateway_download_api/handlers/main.yml b/roles/datagateway_download_api/handlers/main.yml
new file mode 100644
index 0000000..0779506
--- /dev/null
+++ b/roles/datagateway_download_api/handlers/main.yml
@@ -0,0 +1,4 @@
+---
+
+- name: "datagateway_download_api-handler"
+  include_tasks: handlers/datagateway_download_api-handler.yml
diff --git a/roles/topcat/meta/main.yml b/roles/datagateway_download_api/meta/main.yml
similarity index 100%
rename from roles/topcat/meta/main.yml
rename to roles/datagateway_download_api/meta/main.yml
diff --git a/roles/topcat/tasks/create-setup-properties.yml b/roles/datagateway_download_api/tasks/create-setup-properties.yml
similarity index 54%
rename from roles/topcat/tasks/create-setup-properties.yml
rename to roles/datagateway_download_api/tasks/create-setup-properties.yml
index 57e81f9..8f37a58 100644
--- a/roles/topcat/tasks/create-setup-properties.yml
+++ b/roles/datagateway_download_api/tasks/create-setup-properties.yml
@@ -7,9 +7,9 @@
     group: "{{ payara_user }}"
     mode: 0775
 
-- name: "Create a stash directory for topcat configs"
+- name: "Create a stash directory for datagateway-download-api configs"
   file:
-    path: /home/{{ payara_user }}/stash/topcat
+    path: /home/{{ payara_user }}/stash/datagateway-download-api
     state: directory
     owner: "{{ payara_user }}"
     group: "{{ payara_user }}"
@@ -18,26 +18,26 @@
 - name: "Copy over {{ payara_user }} setup.properties"
   template:
     src: "{{ role_path }}/../payara/templates/setup.properties.j2"
-    dest: /home/{{ payara_user }}/stash/topcat/1-part
+    dest: /home/{{ payara_user }}/stash/datagateway-download-api/1-part
     owner: "{{ payara_user }}"
     group: "{{ payara_user }}"
     mode: 0664
 
-- name: "Copy over topcat-setup.properties"
+- name: "Copy over setup.properties"
   template:
-    src: templates/topcat-setup.properties.j2
-    dest: /home/{{ payara_user }}/stash/topcat/2-part
+    src: templates/setup.properties.j2
+    dest: /home/{{ payara_user }}/stash/datagateway-download-api/2-part
     owner: "{{ payara_user }}"
     group: "{{ payara_user }}"
     mode: 0664
 
-- name: "Configure topcat-setup.properties by concatenation of files in the stash"
+- name: "Configure setup.properties by concatenation of files in the stash"
   assemble:
-    src: /home/{{ payara_user }}/stash/topcat
-    dest: /home/{{ payara_user }}/install/topcat/topcat-setup.properties
+    src: /home/{{ payara_user }}/stash/datagateway-download-api
+    dest: /home/{{ payara_user }}/install/datagateway-download-api/setup.properties
     delimiter: '\n'
     owner: "{{ payara_user }}"
     group: "{{ payara_user }}"
     mode: 0600
   notify:
-    - "topcat-handler"
+    - "datagateway_download_api-handler"
diff --git a/roles/datagateway_download_api/tasks/installation.yml b/roles/datagateway_download_api/tasks/installation.yml
new file mode 100644
index 0000000..73ddf58
--- /dev/null
+++ b/roles/datagateway_download_api/tasks/installation.yml
@@ -0,0 +1,26 @@
+---
+
+- name: 'Setup datagateway-download-api'
+  include_tasks: handlers/datagateway_download_api-handler.yml
+
+- name: 'Set fact on host to record that datagateway-download-api has been instantiated'
+  ini_file:
+    path: /etc/ansible/facts.d/local.fact
+    section: 'instantiations'
+    option: 'datagateway_download_api'
+    value: 'true'
+    no_extra_spaces: true
+    create: false
+
+- name: 'Set fact on host to record version of datagateway-download-api that has been instantiated'
+  ini_file:
+    path: /etc/ansible/facts.d/local.fact
+    section: 'versions'
+    option: 'datagateway_download_api'
+    value: '{{ datagateway_download_api_version }}'
+    no_extra_spaces: true
+    create: false
+
+- name: "Force ansible to regather local facts to recognise datagateway-download-api installation"
+  setup:
+    filter: ansible_local
diff --git a/roles/datagateway_download_api/tasks/main.yml b/roles/datagateway_download_api/tasks/main.yml
new file mode 100644
index 0000000..e028cc5
--- /dev/null
+++ b/roles/datagateway_download_api/tasks/main.yml
@@ -0,0 +1,121 @@
+---
+
+- name: "Check datagateway-download-api package"
+  stat:
+    path: /home/{{ payara_user }}/downloads/datagateway-download-api-{{ datagateway_download_api_version }}-distro.zip
+  register: packageResult
+
+- name: "Download datagateway-download-api"
+  community.general.maven_artifact:
+    repository_url: "https://repo.icatproject.org/repo"
+    group_id: "org.icatproject"
+    artifact_id: "datagateway-download-api"
+    version: "{{ datagateway_download_api_version }}"
+    classifier: "distro"
+    extension: "zip"
+    dest: "/home/{{ payara_user }}/downloads/datagateway-download-api-{{ datagateway_download_api_version }}-distro.zip"
+    owner: "{{ payara_user }}"
+    group: "{{ payara_user }}"
+    mode: 0664
+  when: packageResult.stat.exists is defined and packageResult.stat.exists == false
+
+- name: 'Unarchive datagateway-download-api if not installed'
+  unarchive:
+    src: /home/{{ payara_user }}/downloads/datagateway-download-api-{{ datagateway_download_api_version }}-distro.zip
+    dest: /home/{{ payara_user }}/install
+    remote_src: true
+    owner: '{{ payara_user }}'
+    group: '{{ payara_user }}'
+  when: ansible_local.local.instantiations.datagateway_download_api is not defined or ansible_local.local.versions.datagateway_download_api != datagateway_download_api_version
+
+- name: "Find any war files not matching the current version"
+  find:
+    paths: /home/{{ payara_user }}/install/datagateway-download-api/
+    use_regex: yes
+    patterns: "^.*(?<!{{ datagateway_download_api_version }})\\.war$"
+  register: warFilesResult
+
+- name: "Remove war files not matching the current version"
+  file:
+    path: "{{ item.path }}"
+    state: absent
+  with_items: "{{ warFilesResult.files }}"
+
+- name: "Create database for datagateway-download-api"
+  mysql_db:
+    name: "{{ topcat_database }}"
+    login_user: "{{ db_root_username }}"
+    login_password: "{{ db_root_password }}"
+  when: (ansible_local is defined) and (ansible_local.local is defined) and (ansible_local.local.instantiations is defined) and (ansible_local.local.instantiations.mariadb is defined) and (ansible_local.local.instantiations.mariadb == 'true')
+
+- name: "Create user for datagateway-download-api database"
+  mysql_user:
+    name: "{{ db_topcat_username }}"
+    password: "{{ db_topcat_password }}"
+    priv: "{{ topcat_database }}.*:ALL,GRANT"
+    login_user: "{{ db_root_username }}"
+    login_password: "{{ db_root_password }}"
+  when: (ansible_local is defined) and (ansible_local.local is defined) and (ansible_local.local.instantiations is defined) and (ansible_local.local.instantiations.mariadb is defined) and (ansible_local.local.instantiations.mariadb == 'true')
+
+- name: "Check setup.properties file existence"
+  local_action: stat path={{ role_path }}/files/setup.properties
+  become: false
+  register: setupPropertiesResult
+
+- name: "Configure setup.properties via copying"
+  copy:
+    src: files/setup.properties
+    dest: /home/{{ payara_user }}/install/datagateway-download-api/setup.properties
+    owner: "{{ payara_user }}"
+    group: "{{ payara_user }}"
+    mode: 0600
+  when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true
+  notify:
+    - "datagateway_download_api-handler"
+
+- name: "Configure setup.properties via templating"
+  import_tasks: tasks/create-setup-properties.yml
+  when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false
+  notify:
+    - "datagateway_download_api-handler"
+
+- name: "Check run.properties file existence"
+  local_action: stat path={{ role_path }}/files/run.properties
+  become: false
+  register: runPropertiesResult
+
+- name: "Configure run.properties via copying"
+  copy:
+    src: files/run.properties
+    dest: /home/{{ payara_user }}/install/datagateway-download-api/run.properties
+    owner: "{{ payara_user }}"
+    group: "{{ payara_user }}"
+    mode: 0664
+  when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true
+  notify:
+    - "datagateway_download_api-handler"
+
+- name: "Configure run.properties via templating"
+  template:
+    src: templates/run.properties.j2
+    dest: /home/{{ payara_user }}/install/datagateway-download-api/run.properties
+    owner: "{{ payara_user }}"
+    group: "{{ payara_user }}"
+    mode: 0664
+  when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false
+  notify:
+    - "datagateway_download_api-handler"
+
+- name: "Configure datagateway-download-api logback.xml"
+  copy:
+    src: files/logback.xml
+    dest: /home/{{ payara_user }}/install/datagateway-download-api/logback.xml
+    owner: "{{ payara_user }}"
+    group: "{{ payara_user }}"
+    mode: 0664
+  notify:
+    - "datagateway_download_api-handler"
+
+- name: "Setup datagateway-download-api if not setup or a different version is found"
+  import_tasks: tasks/installation.yml
+  when: (ansible_local is not defined) or (ansible_local.local is not defined) or (ansible_local.local.instantiations is not defined) or (ansible_local.local.instantiations.datagateway_download_api is not defined) or (ansible_local.local.instantiations.datagateway_download_api != 'true') or (ansible_local.local.versions.datagateway_download_api != datagateway_download_api_version)
diff --git a/roles/topcat/templates/topcat.properties.j2 b/roles/datagateway_download_api/templates/run.properties.j2
similarity index 100%
rename from roles/topcat/templates/topcat.properties.j2
rename to roles/datagateway_download_api/templates/run.properties.j2
diff --git a/roles/topcat/templates/topcat-setup.properties.j2 b/roles/datagateway_download_api/templates/setup.properties.j2
similarity index 100%
rename from roles/topcat/templates/topcat-setup.properties.j2
rename to roles/datagateway_download_api/templates/setup.properties.j2
diff --git a/roles/topcat/defaults/main.yml b/roles/topcat/defaults/main.yml
deleted file mode 100644
index 749a5e0..0000000
--- a/roles/topcat/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-topcat_version: '3.0.0-SNAPSHOT'
diff --git a/roles/topcat/handlers/main.yml b/roles/topcat/handlers/main.yml
deleted file mode 100644
index 4d92261..0000000
--- a/roles/topcat/handlers/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- name: "topcat-handler"
-  include_tasks: handlers/topcat-handler.yml
diff --git a/roles/topcat/tasks/create-topcat-json.yml b/roles/topcat/tasks/create-topcat-json.yml
deleted file mode 100644
index eede115..0000000
--- a/roles/topcat/tasks/create-topcat-json.yml
+++ /dev/null
@@ -1,118 +0,0 @@
----
-- name: "Edit topcatURL in topcat.json"
-  shell: cat topcat.json.example | jq '.site.topcatUrl = "https://{{ topcat_url }}:8181"' > tmp.json && mv tmp.json topcat.json
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-
-- name: "Remove all facilities except LILS (the test facility)"
-  shell: 'cat topcat.json | jq ''{site, facilities: [ .facilities[] | select(.name == "LILS") ], plugins}'' > tmp.json && mv tmp.json topcat.json'
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-
-- name: "Edit idsUrl in topcat.json"
-  shell: cat topcat.json | jq '.facilities[0].idsUrl = "https://{{ ids_url }}:8181"' > tmp.json && mv tmp.json topcat.json
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-
-- name: "Edit icatUrl in topcat.json"
-  shell: cat topcat.json | jq '.facilities[0].icatUrl = "https://{{ icat_url }}:8181"' > tmp.json && mv tmp.json topcat.json
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-
-- name: "Set authenticationTypes to [] in LILS facility in topcat.json"
-  shell: cat topcat.json | jq '.facilities[0].authenticationTypes = []' > tmp.json && mv tmp.json topcat.json
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-
-- name: "Add Simple authn in topcat.json"
-  shell: 'cat topcat.json | jq ''.facilities[0].authenticationTypes += [{"title": "Simple", "plugin": "simple"}]'' > tmp.json && mv tmp.json topcat.json'
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-  when: ansible_local.local.instantiations.authn_simple is defined and ansible_local.local.instantiations.authn_simple == 'true'
-
-- name: "Add DB authn in topcat.json"
-  shell: 'cat topcat.json | jq ''.facilities[0].authenticationTypes += [{"title": "DB", "plugin": "db"}]'' > tmp.json && mv tmp.json topcat.json'
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-  when: ansible_local.local.instantiations.authn_db is defined and ansible_local.local.instantiations.authn_db == 'true'
-
-- name: "Add Anon authn in topcat.json"
-  shell: 'cat topcat.json | jq ''.facilities[0].authenticationTypes += [{"title": "Anonymous", "plugin": "anon"}]'' > tmp.json && mv tmp.json topcat.json'
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-  when: ansible_local.local.instantiations.authn_anon is defined and ansible_local.local.instantiations.authn_anon == 'true'
-
-- name: "Add LDAP authn in topcat.json"
-  shell: 'cat topcat.json | jq ''.facilities[0].authenticationTypes += [{"title": "LDAP", "plugin": "ldap"}]'' > tmp.json && mv tmp.json topcat.json'
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-  when: ansible_local.local.instantiations.authn_ldap is defined and ansible_local.local.instantiations.authn_ldap == 'true'
-
-- name: "Set http transport type in topcat.json"
-  shell: cat topcat.json | jq '.facilities[0].downloadTransportTypes[0].type = "http"' > tmp.json && mv tmp.json topcat.json
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-
-- name: "Edit http download idsUrl in topcat.json"
-  shell: cat topcat.json | jq '.facilities[0].downloadTransportTypes[0].idsUrl = "http://{{ ids_url }}:8080"' > tmp.json && mv tmp.json topcat.json
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-
-- name: "Set https transport type in topcat.json"
-  shell: cat topcat.json | jq '.facilities[0].downloadTransportTypes[1].type = "https"' > tmp.json && mv tmp.json topcat.json
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-
-- name: "Edit https download idsUrl in topcat.json"
-  shell: cat topcat.json | jq '.facilities[0].downloadTransportTypes[1].idsUrl = "https://{{ ids_url }}:8181"' > tmp.json && mv tmp.json topcat.json
-  become: true
-  become_user: "{{ payara_user }}"
-  args:
-    chdir: /home/{{ payara_user }}/install/topcat
-    executable: /bin/bash
-
-- name: "Remove intermediate file"
-  file:
-    path: /home/{{ payara_user }}/install/topcat/tmp.json
-    state: absent
-
-- name: "Set mode of topcat.json"
-  file:
-    path: /home/{{ payara_user }}/install/topcat/topcat.json
-    mode: 0664
diff --git a/roles/topcat/tasks/installation.yml b/roles/topcat/tasks/installation.yml
deleted file mode 100644
index 6434df7..0000000
--- a/roles/topcat/tasks/installation.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-
-- name: 'Setup topcat'
-  include_tasks: handlers/topcat-handler.yml
-
-- name: 'Set fact on host to record that topcat has been instantiated'
-  ini_file:
-    path: /etc/ansible/facts.d/local.fact
-    section: 'instantiations'
-    option: 'topcat'
-    value: 'true'
-    no_extra_spaces: true
-    create: false
-
-- name: 'Set fact on host to record version of topcat that has been instantiated'
-  ini_file:
-    path: /etc/ansible/facts.d/local.fact
-    section: 'versions'
-    option: 'topcat'
-    value: '{{ topcat_version }}'
-    no_extra_spaces: true
-    create: false
-
-- name: "Force ansible to regather local facts to recognise icat_lucene installation"
-  setup:
-    filter: ansible_local
diff --git a/roles/topcat/tasks/main.yml b/roles/topcat/tasks/main.yml
deleted file mode 100644
index d4252c2..0000000
--- a/roles/topcat/tasks/main.yml
+++ /dev/null
@@ -1,244 +0,0 @@
----
-- name: "Install jq package"
-  package:
-    name: jq
-    state: present
-
-- name: "Check topcat package"
-  stat:
-    path: /home/{{ payara_user }}/downloads/topcat-{{ topcat_version }}-distro.zip
-  register: packageResult
-
-- name: "Download topcat"
-  community.general.maven_artifact:
-    repository_url: "https://repo.icatproject.org/repo"
-    group_id: "org.icatproject"
-    artifact_id: "topcat"
-    version: "{{ topcat_version }}"
-    classifier: "distro"
-    extension: "zip"
-    dest: "/home/{{ payara_user }}/downloads/topcat-{{ topcat_version }}-distro.zip"
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: 0664
-  when: packageResult.stat.exists is defined and packageResult.stat.exists == false
-
-- name: 'Unarchive topcat if not installed'
-  unarchive:
-    src: /home/{{ payara_user }}/downloads/topcat-{{ topcat_version }}-distro.zip
-    dest: /home/{{ payara_user }}/install
-    remote_src: true
-    owner: '{{ payara_user }}'
-    group: '{{ payara_user }}'
-  when: ansible_local.local.instantiations.topcat is not defined or ansible_local.local.versions.topcat != topcat_version
-
-- name: "Find any war files not matching the current version"
-  find:
-    paths: /home/{{ payara_user }}/install/topcat/
-    use_regex: yes
-    patterns: "^.*(?<!{{ topcat_version }})\\.war$"
-  register: warFilesResult
-
-- name: "Remove war files not matching the current version"
-  file:
-    path: "{{ item.path }}"
-    state: absent
-  with_items: "{{ warFilesResult.files }}"
-
-- name: "Create database for topcat"
-  mysql_db:
-    name: "{{ topcat_database }}"
-    login_user: "{{ db_root_username }}"
-    login_password: "{{ db_root_password }}"
-  when: (ansible_local is defined) and (ansible_local.local is defined) and (ansible_local.local.instantiations is defined) and (ansible_local.local.instantiations.mariadb is defined) and (ansible_local.local.instantiations.mariadb == 'true')
-
-- name: "Create user for topcat database"
-  mysql_user:
-    name: "{{ db_topcat_username }}"
-    password: "{{ db_topcat_password }}"
-    priv: "{{ topcat_database }}.*:ALL,GRANT"
-    login_user: "{{ db_root_username }}"
-    login_password: "{{ db_root_password }}"
-  when: (ansible_local is defined) and (ansible_local.local is defined) and (ansible_local.local.instantiations is defined) and (ansible_local.local.instantiations.mariadb is defined) and (ansible_local.local.instantiations.mariadb == 'true')
-
-- name: "Check topcat-setup.properties file existence"
-  local_action: stat path={{ role_path }}/files/topcat-setup.properties
-  become: false
-  register: setupPropertiesResult
-
-- name: "Configure topcat-setup.properties via copying"
-  copy:
-    src: files/setup.properties
-    dest: /home/{{ payara_user }}/install/topcat/topcat-setup.properties
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: 0600
-  when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == true
-  notify:
-    - "topcat-handler"
-
-- name: "Configure topcat-setup.properties via templating"
-  import_tasks: tasks/create-setup-properties.yml
-  when: setupPropertiesResult.stat.exists is defined and setupPropertiesResult.stat.exists == false
-  notify:
-    - "topcat-handler"
-
-- name: "Check topcat.properties file existence"
-  local_action: stat path={{ role_path }}/files/topcat.properties
-  become: false
-  register: runPropertiesResult
-
-- name: "Configure topcat.properties via copying"
-  copy:
-    src: files/topcat.properties
-    dest: /home/{{ payara_user }}/install/topcat/topcat.properties
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: 0664
-  when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == true
-  notify:
-    - "topcat-handler"
-
-- name: "Configure topcat.properties via templating"
-  template:
-    src: templates/topcat.properties.j2
-    dest: /home/{{ payara_user }}/install/topcat/topcat.properties
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: 0664
-  when: runPropertiesResult.stat.exists is defined and runPropertiesResult.stat.exists == false
-  notify:
-    - "topcat-handler"
-
-- name: "Check topcat.json file existence"
-  local_action: stat path={{ role_path }}/files/topcat.json
-  become: false
-  register: topcatJsonResult
-
-- name: "Configure topcat.json via copying"
-  copy:
-    src: files/topcat.json
-    dest: /home/{{ payara_user }}/install/topcat/topcat.json
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: 0664
-  when: topcatJsonResult.stat.exists is defined and topcatJsonResult.stat.exists == true
-  notify:
-    - "topcat-handler"
-
-- name: "Configure topcat.json via templating"
-  import_tasks: tasks/create-topcat-json.yml
-  when: topcatJsonResult.stat.exists is defined and topcatJsonResult.stat.exists == false
-  notify:
-    - "topcat-handler"
-
-- name: "Check lang.json file existence"
-  local_action: stat path={{ role_path }}/files/lang.json
-  become: false
-  register: langJsonResult
-
-- name: "Configure lang.json via copying"
-  copy:
-    src: files/lang.json
-    dest: /home/{{ payara_user }}/install/topcat/lang.json
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: 0664
-  when: langJsonResult.stat.exists is defined and langJsonResult.stat.exists == true
-  notify:
-    - "topcat-handler"
-
-- name: "Configure lang.json via defaults"
-  copy:
-    src: /home/{{ payara_user }}/install/topcat/lang.json.example
-    dest: /home/{{ payara_user }}/install/topcat/lang.json
-    remote_src: true
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: 0664
-  when: langJsonResult.stat.exists is defined and langJsonResult.stat.exists == false
-  notify:
-    - "topcat-handler"
-
-- name: "Check topcat.css file existence"
-  local_action: stat path={{ role_path }}/files/topcat.css
-  become: false
-  register: topcatCssResult
-
-- name: "Configure topcat.css via copying"
-  copy:
-    src: files/topcat.css
-    dest: /home/{{ payara_user }}/install/topcat/topcat.css
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: 0664
-  when: topcatCssResult.stat.exists is defined and topcatCssResult.stat.exists == true
-  notify:
-    - "topcat-handler"
-
-- name: "Configure topcat.css via defaults"
-  copy:
-    src: /home/{{ payara_user }}/install/topcat/topcat.css.example
-    dest: /home/{{ payara_user }}/install/topcat/topcat.css
-    remote_src: true
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: 0664
-  when: topcatCssResult.stat.exists is defined and topcatCssResult.stat.exists == false
-  notify:
-    - "topcat-handler"
-
-- name: "Check content directory"
-  local_action: stat path={{ role_path }}/files/content
-  become: false
-  register: contentResult
-
-- name: "Ensure content directory doesn't exist"
-  file:
-    path: /home/{{ payara_user }}/install/topcat/content
-    state: absent
-
-- name: "Create empty content directory"
-  file:
-    path: /home/{{ payara_user }}/install/topcat/content
-    state: directory
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: u=rwX,g=rX,o=rX
-
-- name: "Configure content directory via copying"
-  copy:
-    src: files/content/
-    dest: /home/{{ payara_user }}/install/topcat/content
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: u=rwX,g=rX,o=rX
-  when: contentResult.stat.exists is defined and contentResult.stat.exists == true
-  notify:
-    - "topcat-handler"
-
-- name: "Configure content directory via defaults"
-  copy:
-    src: /home/{{ payara_user }}/install/topcat/content.example/
-    dest: /home/{{ payara_user }}/install/topcat/content
-    remote_src: true
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: u=rwX,g=rX,o=rX
-  when: contentResult.stat.exists is defined and contentResult.stat.exists == false
-  notify:
-    - "topcat-handler"
-
-- name: "Configure topcat logback.xml"
-  copy:
-    src: files/logback.xml
-    dest: /home/{{ payara_user }}/install/topcat/logback.xml
-    owner: "{{ payara_user }}"
-    group: "{{ payara_user }}"
-    mode: 0664
-  notify:
-    - "topcat-handler"
-
-- name: "Setup topcat if not setup or a different version is found"
-  import_tasks: tasks/installation.yml
-  when: (ansible_local is not defined) or (ansible_local.local is not defined) or (ansible_local.local.instantiations is not defined) or (ansible_local.local.instantiations.topcat is not defined) or (ansible_local.local.instantiations.topcat != 'true') or (ansible_local.local.versions.topcat != topcat_version)