diff --git a/Pipfile b/Pipfile
index e78f929..55de93b 100644
--- a/Pipfile
+++ b/Pipfile
@@ -9,7 +9,7 @@ boto3 = "==1.9.242"
 botocore = "==1.12.242"
 
 [dev-packages]
-molecule = "==2.20.2"
+molecule = "==3.2.2"
 docker = "==4.1.0"
 six = "*"
 taskcat = "*"
diff --git a/roles/linux_common/files/java.conf b/roles/linux_common/files/java.conf
new file mode 100644
index 0000000..d9a599f
--- /dev/null
+++ b/roles/linux_common/files/java.conf
@@ -0,0 +1,3 @@
+# Exclude java-hooks
+x /tmp/hsperfdata_*
+x /tmp/.java_pid*
\ No newline at end of file
diff --git a/roles/linux_common/tasks/main.yml b/roles/linux_common/tasks/main.yml
index 825fbd7..2fadb06 100644
--- a/roles/linux_common/tasks/main.yml
+++ b/roles/linux_common/tasks/main.yml
@@ -26,3 +26,19 @@
     uid: "{{ atl_product_user_uid }}"
     group: "{{ atl_product_user }}"
     comment: "Product runtime user"
+
+- name: Stop systemd-cleanup deleting the jvm socket file
+  copy:
+    src: java.conf
+    dest: "/usr/lib/tmpfiles.d/java.conf"
+    owner: root
+    group: root
+    mode: "644"
+  register: systemd_config_changed
+
+- name: Force systemd to reload daemon configuration
+  systemd:
+    daemon_reload: yes
+  when:
+    - systemd_config_changed is defined
+    - molecule_yml is not defined  # molecule cannot run systemctl commands and notest doesn't work for handlers