diff --git a/.run/Production build.run.xml b/.run/Production build.run.xml
index c83bfc6..af46d94 100644
--- a/.run/Production build.run.xml	
+++ b/.run/Production build.run.xml	
@@ -2,7 +2,7 @@
   <configuration default="false" name="Production build" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/app" />
       <option name="externalSystemIdString" value="GRADLE" />
       <option name="scriptParameters" value="-Pvaadin.productionMode=true" />
       <option name="taskDescriptions">
@@ -10,8 +10,8 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":gameyfin:clean" />
-          <option value=":gameyfin:build" />
+          <option value="clean" />
+          <option value="build" />
         </list>
       </option>
       <option name="vmOptions" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 17ba943..54760e4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,5 @@
 group = "de.grimsi"
-val appMainClass = "org.gameyfin.GameyfinApplicationKt"
+val appMainClass = "org.gameyfin.app.GameyfinApplicationKt"
 
 plugins {
     id("org.springframework.boot")
diff --git a/app/src/main/bundles/prod.bundle b/app/src/main/bundles/prod.bundle
index 25fcf28..525839f 100644
Binary files a/app/src/main/bundles/prod.bundle and b/app/src/main/bundles/prod.bundle differ
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 511a227..1900eee 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,21 +1,26 @@
+# syntax=docker/dockerfile:1.4
 FROM eclipse-temurin:21-jre-alpine
 
-ENV GAMEYFIN_SOURCES=/opt/gameyfin-library
 ENV USER=gameyfin
 
-
 RUN addgroup gameyfin && \
-    adduser --disabled-password --gecos "" --ingroup "$USER" --no-create-home "$USER" && \
-    mkdir -p /opt/gameyfin ${GAMEYFIN_SOURCES} && \
-    chown -R gameyfin:gameyfin /opt/gameyfin ${GAMEYFIN_SOURCES}
+    adduser --disabled-password --gecos "" --ingroup "$USER" --no-create-home "$USER"
 
 USER gameyfin:gameyfin
 
-ARG JAR_FILE=./backend/target/*.jar
-COPY ${JAR_FILE} /opt/gameyfin/gameyfin.jar
-
 WORKDIR /opt/gameyfin
 
+# Copy application jar (not ending with -plain.jar)
+COPY --chown=gameyfin:gameyfin ./app/build/libs/ /tmp/app-libs/
+RUN find /tmp/app-libs -type f -name "*.jar" ! -name "*-plain.jar" -exec cp {} /opt/gameyfin/gameyfin.jar \; && \
+    rm -rf /tmp/app-libs
+
+# Copy all plugin jars
+COPY --chown=gameyfin:gameyfin ./plugins/ /tmp/plugins/
+RUN mkdir -p /opt/gameyfin/plugins && \
+    find /tmp/plugins -type f -path "*/build/libs/*.jar" -exec cp {} /opt/gameyfin/plugins/ \; && \
+    rm -rf /tmp/plugins
+
 EXPOSE 8080
 
-ENTRYPOINT ["java", "-jar", "gameyfin.jar"]
+ENTRYPOINT ["java", "-jar", "gameyfin.jar"]
\ No newline at end of file
diff --git a/docker/docker-compose.example.yml b/docker/docker-compose.example.yml
index 04528db..8df412e 100644
--- a/docker/docker-compose.example.yml
+++ b/docker/docker-compose.example.yml
@@ -1,11 +1,18 @@
 version: "3"
 services:
   gameyfin:
-    image: grimsi/gameyfin:v2
+    image: gameyfin/app:2.0.0.beta2
     container_name: gameyfin
     environment:
-      PLACEHOLDER: ""
+      # Generate a new APP_KEY using the command `openssl rand -base64 32` or similar.
+      APP_KEY: <you app key here>
     volumes:
-      - <path to your game library>:/opt/gameyfin-library
+      - "./db:/opt/gameyfin/db"
+      - "./data:/opt/gameyfin/data"
+      - "./logs:/opt/gameyfin/logs"
+      - <mount your library folder(s) here>
     ports:
       - "8080:8080"
+      # If you plan to use the included torrent plugin, uncomment the following lines:
+      # - "6969:6969"
+      # - "6881:6881"
diff --git a/gradle.properties b/gradle.properties
index 450a3c0..47c1f5a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,5 @@
+# Increase Gradle metaspace size
+org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m
 # Plugin versions
 kotlinVersion=2.1.21
 kspVersion=2.1.21-2.0.1
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
index 6db1df3..06683de 100644
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -4,6 +4,13 @@ plugins {
     kotlin("jvm")
 }
 
+val keystorePath: String = rootProject.file("certs/gameyfin.jks").absolutePath
+val keystoreAlias = "gameyfin-plugins"
+val keystorePassword: String = (findProperty("keystorePassword") as String?)
+    ?: System.getenv("GAMEYFIN_KEYSTORE_PASSWORD")
+    ?: ""
+
+
 subprojects {
     apply(plugin = "org.jetbrains.kotlin.jvm")
 
@@ -56,4 +63,30 @@ subprojects {
     tasks.build {
         dependsOn("copyDependencyClasses")
     }
+
+
+    tasks.register<Exec>("signJar") {
+        dependsOn(tasks.jar)
+        val jarFile = tasks.jar.get().archiveFile.get().asFile
+
+        // Only enable if password is present
+        enabled = keystorePassword.isNotEmpty()
+
+        commandLine(
+            "jarsigner",
+            "-keystore", keystorePath,
+            "-storepass", keystorePassword,
+            jarFile.absolutePath,
+            keystoreAlias
+        )
+        doFirst {
+            if (keystorePassword.isEmpty()) {
+                logger.lifecycle("Keystore password not provided, skipping JAR signing.")
+            }
+        }
+    }
+
+    tasks.build {
+        dependsOn("signJar")
+    }
 }
\ No newline at end of file