diff --git a/kimai/docker-compose.yaml b/kimai/docker-compose.yaml
index ed0e276..33dde0b 100644
--- a/kimai/docker-compose.yaml
+++ b/kimai/docker-compose.yaml
@@ -6,14 +6,16 @@ networks:
     external: false
 
 volumes:
-  kimai:
-    name: kimai
   kimai-db:
     name: kimai-db
+  kimai-data:
+    name: kimai-data
+  kimai-plugins:
+    name: kimai-plugins
 
 services:
   kimai:
-    image: kimai/kimai2:fpm
+    image: kimai/kimai2:apache
     container_name: kimai
     hostname: kimai
     restart: unless-stopped
@@ -26,28 +28,16 @@ services:
     depends_on:
       - kimai-db
     networks:
+      - proxy
       - kimai
     volumes:
-      - kimai:/opt/kimai/public
-
-  kimai-web:
-    image: nginx:alpine
-    container_name: kimai-web
-    hostname: kimai-web
-    restart: unless-stopped
+      - kimai-data:/opt/kimai/var/data
+      - kimai-plugins:/opt/kimai/var/plugins
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.kimai.entrypoints=web"
       - "traefik.http.routers.kimai.rule=Host(`kimai.lan`)"
-      - "traefik.http.services.kimai.loadbalancer.server.port=80"
-    depends_on:
-      - kimai
-    networks:
-      - proxy
-      - kimai
-    volumes:
-      - kimai:/opt/kimai/public:ro
-      - ${PWD}/kimai.conf:/etc/nginx/conf.d/default.conf
+      - "traefik.http.services.kimai.loadbalancer.server.port=8001"
 
   kimai-db:
     image: mysql:8
diff --git a/kimai/kimai.conf b/kimai/kimai.conf
deleted file mode 100644
index bcbd0e9..0000000
--- a/kimai/kimai.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-server {
-    listen 80;
-    index index.php;
-    server_name kimai.lan;
-    root /opt/kimai/public;
-
-    # cache static asset files
-    location ~* \.(ico|css|js|gif|jpe?g|png)(\?[0-9]+)?$ {
-            expires max;
-            log_not_found off;
-    }
-
-    location / {
-        try_files $uri $uri/ /index.php$is_args$args;
-    }
-
-    location ~ ^/index\.php(/|$) {
-        fastcgi_pass kimai:9000;
-        fastcgi_split_path_info ^(.+\.php)(/.*)$;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
-        fastcgi_param DOCUMENT_ROOT $realpath_root;
-        internal;
-    }
-}
\ No newline at end of file