diff --git a/History.md b/History.md
index c34c594e..26140c77 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,19 @@
+3.0.4 04/12/2024
+================
+ * Automatically disconnect guacamole sessions if no ping event has been received in 30 seconds
+ * Use smallrye timers to send error report emails rather than scheduler so that they can be sent even if scheduler is disabled
+ * Properly queue desktop events and ensure they are run sequentially for a specific desktop session
+ * Use of partial (or dto) objects and simplified models to reduce sql select and update overheads
+ * Remove preql library
+ * Many SQL optimisations to reduce loading time of several pages and also to minimise time spent in remote desktop event handler
+ * FIX #15: Improve loading time of admin user page by removing calls to cloud provider for each user instance
+ * FIX #14: Ensure client forces user to re-authenticate when token is no longer valid
+ * FIX #13: Ensure that instance sessions members are deleted
+ * FIX #12: Bug fix on instance interactivity being stored during many consecutive remote desktop events rather than just one 
+ * FIX #11: Set socket state to disconnected immediately on disconnect event to avoid further data being sent to client
+ * FIX #10: Avoid calls to cloud provider to ensure rapid response for admin instances page (ip address already in database)
+ * FIX #9: SQL optimisations to obtain instance data, rapid load of home page with many instances
+ 
 3.0.3 27/11/2024
 ================
  * FIX #6: Add responses for POST Requests in JupyterController
diff --git a/pom.xml b/pom.xml
index 1cd6b91c..f7d90188 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>eu.ill.visa</groupId>
     <artifactId>api</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
 
     <modules>
         <module>visa-core</module>
diff --git a/visa-app/pom.xml b/visa-app/pom.xml
index dcc65728..45ff9b08 100644
--- a/visa-app/pom.xml
+++ b/visa-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-web-rest</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-web-graphql</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-web-gateway</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-remote-desktop</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-scheduler</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
     </dependencies>
 
diff --git a/visa-business/pom.xml b/visa-business/pom.xml
index 2bb7b680..87457025 100644
--- a/visa-business/pom.xml
+++ b/visa-business/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,17 +22,17 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-persistence</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-cloud</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-message-broker</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
 
         <dependency>
diff --git a/visa-cloud/pom.xml b/visa-cloud/pom.xml
index 86ec68ff..68d9fbab 100644
--- a/visa-cloud/pom.xml
+++ b/visa-cloud/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/visa-core/pom.xml b/visa-core/pom.xml
index 75b067e0..5641f144 100644
--- a/visa-core/pom.xml
+++ b/visa-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/visa-message-broker/pom.xml b/visa-message-broker/pom.xml
index 5266ca50..73ed1ef4 100644
--- a/visa-message-broker/pom.xml
+++ b/visa-message-broker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-core</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
 
         <dependency>
diff --git a/visa-persistence/pom.xml b/visa-persistence/pom.xml
index 316d67df..1d42b1dd 100644
--- a/visa-persistence/pom.xml
+++ b/visa-persistence/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-core</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
     </dependencies>
 
diff --git a/visa-remote-desktop/pom.xml b/visa-remote-desktop/pom.xml
index 8dcde62d..eaeaed98 100644
--- a/visa-remote-desktop/pom.xml
+++ b/visa-remote-desktop/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
 
         <dependency>
diff --git a/visa-scheduler/pom.xml b/visa-scheduler/pom.xml
index 1ff51e9f..1a1c2f16 100644
--- a/visa-scheduler/pom.xml
+++ b/visa-scheduler/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/visa-security/pom.xml b/visa-security/pom.xml
index 07fd5641..3b5b3d1f 100644
--- a/visa-security/pom.xml
+++ b/visa-security/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>visa-security</artifactId>
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
 
         <dependency>
diff --git a/visa-web-gateway/pom.xml b/visa-web-gateway/pom.xml
index ce2452c2..bb0457c8 100644
--- a/visa-web-gateway/pom.xml
+++ b/visa-web-gateway/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-message-broker</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
     </dependencies>
 
diff --git a/visa-web-graphql/pom.xml b/visa-web-graphql/pom.xml
index 767d827a..a1eec287 100644
--- a/visa-web-graphql/pom.xml
+++ b/visa-web-graphql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-security</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
 
         <dependency>
diff --git a/visa-web-rest/pom.xml b/visa-web-rest/pom.xml
index e9c13f1b..add4e4e9 100644
--- a/visa-web-rest/pom.xml
+++ b/visa-web-rest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-security</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
 
         <dependency>