diff --git a/.gitignore b/.gitignore
index e6d81fd1..97d69c0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+db/
 web/
 bin/
 
diff --git a/Dockerfile b/Dockerfile
index 157df0bc..ece858b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 # Use a multi-stage build to keep the image size small
 # Start with a Gradle image for building the project
-FROM gradle:jdk21-alpine as builder
+#FROM gradle:jdk21-alpine as builder
+FROM gradle:8.8.0-jdk21 as builder
 
 # Copy the Gradle wrapper and configuration files separately to leverage Docker cache
 COPY --chown=gradle:gradle gradlew /home/gradle/
diff --git a/build.gradle.kts b/build.gradle.kts
index 0939e737..850112c3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -131,4 +131,4 @@ tasks.withType<Javadoc> {
 
 tasks.getByName<Jar>("jar") {
     enabled = false
-}
\ No newline at end of file
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index 4d306e5d..e35342c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,13 @@
-version: '3.8'
-
 services:
   app:
-    image: hykilpikonna/aquadx:latest
+    build:
+      context: .
+      dockerfile: Dockerfile
     ports:
       - "80:80"
       - "8443:8443"
       - "22345:22345"
+    restart: on-failure:3
     environment:
       - SPRING_DATASOURCE_URL=jdbc:mariadb://db:3306/main
       - SPRING_DATASOURCE_USERNAME=cat
@@ -17,7 +18,6 @@ services:
     volumes:
       - ./config:/app/config
       - ./data:/app/data
-
   db:
     image: mariadb:latest
     environment:
@@ -26,9 +26,9 @@ services:
       MYSQL_USER: cat
       MYSQL_PASSWORD: meow
     ports:
-      - "127.0.0.1:3369:3306"
+      - "${AQUADX_DB_PORT:-127.0.0.1:3369}:3306"
     volumes:
-      - mariadb_data:/var/lib/mysql
+      - "${AQUADX_DB_DATA:-mariadb_data}:/var/lib/mysql"
 
 volumes:
-  mariadb_data:
\ No newline at end of file
+  mariadb_data: