diff --git a/demw-common/overlay/opt/eidas-middleware/configuration/application.properties.sh b/demw-common/overlay/opt/eidas-middleware/configuration/application.properties.sh
index 0c0f82b7..c8dfde6b 100644
--- a/demw-common/overlay/opt/eidas-middleware/configuration/application.properties.sh
+++ b/demw-common/overlay/opt/eidas-middleware/configuration/application.properties.sh
@@ -11,7 +11,8 @@ server.ssl.keyStoreType:PKCS12
 server.ssl.keyAlias:tls
 
 #database connection
-spring.datasource.url=jdbc:h2:/opt/eidas-middleware/database/eidasmw;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+#spring.datasource.url=jdbc:h2:/opt/eidas-middleware/database/eidasmw;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url=jdbc:hsqldb:file:/opt/eidas-middleware/database/hsql/eidasmw
 spring.datasource.username=${SPRING_DATASOURCE_USERNAME:-demw}
 spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
 
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index cf6822b6..171332b0 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -889,7 +889,7 @@ demw-1.sveidas.se:
    konsulter:
    autoupdate:
    eidas_de_middleware_hsm:
-      version: 320-sc_hsm2
+      version: 330-sc_hsm2
       hostname: demw.eidas.swedenconnect.se
    webserver:
       enabled: true