diff --git a/hosts/Development/default.nix b/hosts/Development/default.nix
index fda8e57..77f6758 100644
--- a/hosts/Development/default.nix
+++ b/hosts/Development/default.nix
@@ -11,6 +11,7 @@
         };
         traefik.enable = true;
         plex.enable = true;
+        solidtime.enable = true;
       };
       virtualisation.guest.enable = true;
     };
diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index f62dca7..385f915 100644
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -9,6 +9,7 @@
     ./homepage
     ./jellyfin
     ./plex
+    ./solidtime
     ./speedtest
     ./technitium-dns
     ./traefik
diff --git a/modules/apps/solidtime/default.nix b/modules/apps/solidtime/default.nix
index 9174df4..725d32d 100644
--- a/modules/apps/solidtime/default.nix
+++ b/modules/apps/solidtime/default.nix
@@ -5,10 +5,8 @@ let
 
   networkName = "solidtime";
   internalNetworkName = "solidtime-internal";
+  proxyNet = config.homelab.apps.traefiik.sharedNetworkName;
 
-  version = "0.8.0";
-
-  port = 8000;
   user = "1000:1000";
 
   # dbExternalPort = ...;
@@ -18,6 +16,16 @@ let
 
   inherit (config.virtualisation.oci-containers) containers;
 
+  solidtimeImageName = "solidtime/solidtime";
+  version = "0.10.0";
+  solidtimeImage = "${solidtimeImageName}:${version}";
+  solidtimeImageFile = pkgs.dockerTools.pullImage {
+    imageName = solidtimeImageName;
+    finalImageTag = version;
+    imageDigest = "sha256:817d3a366ecc39f0473d7154372afa82dd4e6e50c66d70be45804892c8421cbb";
+    sha256 = "sha256-h5aCKaquUF/EVsOHaLOHrn1HAoXZYPhAbJ+e4cmjSA8=";
+  };
+
   volumes = [
     "solidtime-storage:/var/www/html/storage"
     "solidtime-logs:/var/www/html/storage/logs"
@@ -30,7 +38,7 @@ let
     VITE_APP_NAME = laravelEnv.APP_NAME;
     APP_ENV = "production";
     APP_DEBUG = "false";
-    APP_URL = "http://localhost:${toString port}";
+    APP_URL = "http://localhost:${toString cfg.port}";
     APP_FORCE_HTTPS = "false";
     APP_ENABLE_REGISTRATION = "false";
     TRUSTED_PROXIES = "0.0.0.0/0,2000:0:0:0:0:0:0:0/3";
@@ -70,7 +78,15 @@ let
   };
 
 in {
-  options.homelab.apps.solidtime.enable = lib.mkEnableOption "Solidtime time tracker using Docker";
+  options.homelab.apps.solidtime = {
+    enable = lib.mkEnableOption "Solidtime time tracker using Docker";
+    port = lib.mkOption {
+      type = lib.types.int;
+      default = 8000;
+      description = "Solidtime WebUI port";
+    };
+    exposePort = lib.mkEnableOption "Expose Soldtime port";
+  };
 
   config = lib.mkIf cfg.enable {
     homelab.virtualisation.containers.enable = true;
@@ -116,53 +132,57 @@ in {
     virtualisation.oci-containers.containers = {
       solidtime = {
         hostname = "solidtime";
-        image = "solidtime/solidtime:${version}";
-        autoStart = true;
+        image = solidtimeImage;
+        imageFile = solidtimeImageFile;
         inherit user;
-        ports = [
-          # Open ports if you don't use Traefik
-          "${toString port}:8000"
-        ];
-        extraOptions = [
-          "--network=${networkName}"
-          "--network=${internalNetworkName}"
-
-          # Healthecks
-          # test: [ "CMD-SHELL", "curl --fail http://localhost:8000/health-check/up || exit 1" ]
-          ''--health-cmd=curl --fail http://localhost:8000/health-check/up || exit 1''
-        ];
-        inherit volumes;
+        autoStart = true;
         dependsOn = [
           "solidtimeDb"
         ];
+        ports = [
+          # Open ports if you don't use Traefik
+          "${toString cfg.port}:8000"
+        ];
+        networks = [
+          networkName
+          internalNetworkName
+        ];
+        extraOptions = [
+          # Healthecks
+          # test: [ "CMD", "curl", "--fail", "http://localhost:8000/health-check/up" ]
+          ''--health-cmd=curl --fail http://localhost:8000/health-check/up''
+        ];
+        inherit volumes;
+        labels = {
+          "traefik.enable" = "true";
+          "traefik.http.routers.solidtime.rule" = "Host(`time.${config.networking.hostName}.depeuter.dev`)";
+          "traefik.http.services.solidtime.loadbalancer.server.port" = toString cfg.port;
+        };
         environmentFiles = [
           "/home/admin/.solidtime.env"
         ];
         environment = laravelEnv // {
           CONTAINER_MODE = "http";
         };
-        labels = {
-          "traefik.enable" = "true";
-          "traefik.http.routers.solidtime.rule" = "Host(`time.${config.networking.hostName}.depeuter.dev`)";
-          "traefik.http.services.solidtime.loadbalancer.server.port" = toString port;
-        };
       };
       solidtimeScheduler = {
         hostname = "scheduler";
-        image = "solidtime/solidtime:${version}";
+        image = solidtimeImage;
+        imageFile = solidtimeImageFile;
         inherit user;
         autoStart = true;
-        extraOptions = [
-          "--network=${internalNetworkName}"
-
-          # Healthchecks
-          # test: [ "CMD-SHELL", "supervisorctl status scheduler:scheduler_00" ]
-          ''--health-cmd="supervisorctl status scheduler:scheduler_00"''
-        ];
-        inherit volumes;
         dependsOn = [
           "solidtimeDb"
         ];
+        networks = [
+          internalNetworkName
+        ];
+        extraOptions = [
+          # Healthchecks
+          # test: [ "CMD", "healthcheck" ]
+          ''--health-cmd="healthcheck"''
+        ];
+        inherit volumes;
         environmentFiles = [
           "/home/admin/.solidtime.env"
         ];
@@ -172,15 +192,17 @@ in {
       };
       solidtimeQueue = {
         hostname = "queue";
-        image = "solidtime/solidtime:${version}";
+        image = solidtimeImage;
+        imageFile = solidtimeImageFile;
         inherit user;
         autoStart = true;
+        networks = [
+          internalNetworkName
+        ];
         extraOptions = [
-          "--network=${internalNetworkName}"
-
           # Healthchecks
-          # test: [ "CMD-SHELL", "supervisorctl status worker:worker_00" ]
-          ''--health-cmd="supervisorctl status worker:worker_00"''
+          # test: [ "CMD", "healthcheck" ]
+          ''--health-cmd="healthcheck"''
         ];
         inherit volumes;
         dependsOn = [
@@ -194,16 +216,25 @@ in {
           WORKER_COMMAND = "php /var/www/html/artisan queue:work";
         };
       };
-      solidtimeDb = {
+      solidtimeDb = let
+        imageName = "postgres";
+        finalImageTag = "15";
+      in {
         hostname = "database";
-        image = "postgres:15";
+        image = "${imageName}:${finalImageTag}";
+        imageFile = pkgs.dockerTools.pullImage {
+          inherit imageName finalImageTag;
+          imageDigest = "sha256:98fe06b500b5eb29e45bf8c073eb0ca399790ce17b1d586448edc4203627d342";
+          sha256 = "sha256-AZ4VkOlROX+nR/MjDjsA4xdHzmtKjiBAtsp2Q6IdOvg=";
+        };
         autoStart = true;
         ports = [
           # "${toString dbExternalPort}:${toString dbInternalPort}"
         ];
+        networks = [
+          internalNetworkName
+        ];
         extraOptions = [
-          "--network=${internalNetworkName}"
-
           # Healthchecks
           # test: - CMD - pg_isready - '-q' - '-d' - '${DB_DATABASE}' - '-U' - '${DB_USERNAME}' retries: 3 timeout: 5s
           ''--health-cmd="pg_isready -q -d ${laravelEnv.DB_DATABASE} -U ${laravelEnv.DB_USERNAME}"''
@@ -220,13 +251,22 @@ in {
           POSTGRES_PASSWORD = laravelEnv.DB_PASSWORD;
         };
       };
-      solidtimeGotenberg = {
+      solidtimeGotenberg = let
+        imageName = "gotenberg/gotenberg";
+        finalImageTag = "8.26.0";
+      in {
         hostname = "gotenberg";
-        image = "gotenberg/gotenberg:8";
+        image = "${imageName}:${finalImageTag}";
+        imageFile = pkgs.dockerTools.pullImage {
+          inherit imageName finalImageTag;
+          imageDigest = "sha256:328551506b3dec3ff6381dd47e5cd72a44def97506908269e201a8fbfa1c12c0";
+          sha256 = "sha256-1zz4xDAgXxHUnkCVIfjHTgXb82EFEx+5am6Cu9+eZj4=";
+        };
         autoStart = true;
+        networks = [
+          internalNetworkName
+        ];
         extraOptions = [
-          "--network=${internalNetworkName}"
-
           # Healthchecks
           # test: [ "CMD", "curl", "--silent", "--fail", "http://localhost:3000/health" ]
           ''--health-cmd="curl --silent --fail http://localhost:${toString gotenbergPort}/health"''