diff --git a/tasks/payara.yml b/tasks/payara.yml
index 29f8421..65dae6b 100644
--- a/tasks/payara.yml
+++ b/tasks/payara.yml
@@ -136,5 +136,24 @@
     mode: '0750'
     state: directory
 
-- name: flush hadlers to start payara and possibly reload systemd
+- name: workaround for FISH-7665
+  lineinfile:
+    path: '{{ payara_dir }}/glassfish/config/asenv.conf'
+    line: '{{ item }}'
+  with_items:
+    - 'export JAVA_TOOL_OPTIONS'
+    - 'JAVA_TOOL_OPTIONS="-Djdk.util.zip.disableZip64ExtraFieldValidation=true --add-opens=java.base/java.io=ALL-UNNAMED"'
+  when: dataverse.payara.zipurl is match(".*payara-6.*")
+
+- name: workaround for FISH-7665
+  template:
+    src: payara6.service.j2
+    dest: /usr/lib/systemd/system/payara.service
+    owner: root
+    group: root
+    mode: 0644
+  when: (ansible_os_family == "RedHat") and (dataverse.payara.zipurl is match(".*payara-6.*"))
+  notify: reload systemd
+
+- name: flush handlers to start payara and possibly reload systemd
   meta: flush_handlers
diff --git a/templates/payara6.service.j2 b/templates/payara6.service.j2
new file mode 100644
index 0000000..9b7e001
--- /dev/null
+++ b/templates/payara6.service.j2
@@ -0,0 +1,15 @@
+[Unit]
+Description = Payara Server
+After = syslog.target network.target
+
+[Service]
+Type = forking
+User = {{ dataverse.payara.user }}
+ExecStart = {{ payara_dir }}/bin/asadmin start-domain
+ExecStop = {{ payara_dir }}/bin/asadmin stop-domain
+ExecReload = {{ payara_dir }}/bin/asadmin restart-domain
+LimitNOFILE = 65000
+TimeoutStartSec = {{ dataverse.payara.launch_timeout }}s
+
+[Install]
+WantedBy = multi-user.target