diff --git a/backend/src/main/java/de/grimsi/gameyfin/config/SecureProperties.java b/backend/src/main/java/de/grimsi/gameyfin/config/SecureProperties.java
deleted file mode 100644
index 3140b37..0000000
--- a/backend/src/main/java/de/grimsi/gameyfin/config/SecureProperties.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.grimsi.gameyfin.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.PropertiesPropertySource;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PropertiesLoaderUtils;
-
-import java.util.Objects;
-
-@Configuration
-public class SecureProperties {
-
-    @Autowired
-    public void setConfigurableEnvironment(ConfigurableEnvironment env) {
-        try {
-            Resource resource = new ClassPathResource("/config/secure.yml");
-            env.getPropertySources().addFirst(new PropertiesPropertySource(Objects.requireNonNull(resource.getFilename()), PropertiesLoaderUtils.loadProperties(resource)));
-        } catch (Exception ex) {
-            throw new RuntimeException(ex.getMessage(), ex);
-        }
-    }
-}
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 850a4f0..a4ff3e4 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -1,12 +1,23 @@
 server:
   port: 8080
+  error.include-stacktrace: never
 
 spring:
+  mvc:
+    async.request-timeout: -1
+  jackson.default-property-inclusion: non_null
   datasource.db-name: gameyfin_db
   datasource.url: jdbc:h2:file:${gameyfin.db}/${spring.datasource.db-name};AUTO_SERVER=TRUE
   datasource.username: gfadmin
   datasource.password: gameyfin
   datasource.driverClassName: org.h2.Driver
+  jpa:
+    database-platform: org.hibernate.dialect.H2Dialect
+    hibernate.ddl-auto: update
+    open-in-view: true
+    properties:
+      hibernate:
+        event.merge.entity_copy_observer: allow
 
 gameyfin:
   user: ""