diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 445f010c3b..c7460932a1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -313,6 +313,13 @@ jobs:
           name: CoverageReport-newui-${{ matrix.newui }}
           path: coverage_report.tar
 
+       - name: Save Memory Logs
+        if: failure()
+        uses: actions/upload-artifact@v3.1.3
+        with:
+          name: memLogs-new_${{ matrix.newui }}-psql_${{ matrix.pgsql-image }}
+          path: /tmp/sbt*
+
   rest-module-testing:
     needs: build_and_check
 
diff --git a/autotest/.jvmopts b/autotest/.jvmopts
index c776d9d4d3..d646dc2aff 100644
--- a/autotest/.jvmopts
+++ b/autotest/.jvmopts
@@ -1,3 +1,7 @@
 -Xms2g
 -Xmx3g
 -XX:+UseG1GC
+-Xlog:gc*:file=/tmp/sbt-gc-%t.log:tags,time,uptime,level:filecount=10,filesize=2M
+-XX:+HeapDumpOnOutOfMemoryError
+-XX:HeapDumpPath=/tmp/sbt-<pid>.hprof
+-XX:+UseGCOverheadLimit