diff --git a/hosts/AZ-CLD-1/services/containers/default.nix b/hosts/AZ-CLD-1/services/containers/default.nix
index 99b1967..db191f8 100644
--- a/hosts/AZ-CLD-1/services/containers/default.nix
+++ b/hosts/AZ-CLD-1/services/containers/default.nix
@@ -1,6 +1,7 @@
 {lib, ...}: {
   imports = [
     ./baserow.nix
+    ./it-tools.nix
     ./librechat.nix
     ./litellm.nix
     ./librechat-dev.nix
diff --git a/hosts/AZ-CLD-1/services/it-tools.nix b/hosts/AZ-CLD-1/services/containers/it-tools.nix
similarity index 53%
rename from hosts/AZ-CLD-1/services/it-tools.nix
rename to hosts/AZ-CLD-1/services/containers/it-tools.nix
index 7ee55f4..1ac71ae 100644
--- a/hosts/AZ-CLD-1/services/it-tools.nix
+++ b/hosts/AZ-CLD-1/services/containers/it-tools.nix
@@ -1,28 +1,11 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
+{lib, ...}: let
   serviceName = "it-tools";
-  portUtils = import ../../../lib/port-utils.nix {inherit lib;};
+  portUtils = import ../../../../lib/port-utils.nix {inherit lib;};
   servicePort = portUtils.getPort serviceName "AZ-CLD-1";
 in {
-  services.nginx = {
-    enable = true;
-    virtualHosts.${serviceName} = {
-      listen = [
-        {
-          addr = "127.0.0.1";
-          port = servicePort;
-        }
-      ];
-      locations."/" = {
-        root = "${pkgs.it-tools}/lib";
-        index = "index.html";
-        tryFiles = "$uri $uri/ /index.html";
-      };
-    };
+  virtualisation.oci-containers.containers.${serviceName} = {
+    image = "docker.io/sharevb/it-tools:latest";
+    ports = ["127.0.0.1:${toString servicePort}:8080"];
   };
 
   # Traefik configuration
diff --git a/hosts/AZ-CLD-1/services/default.nix b/hosts/AZ-CLD-1/services/default.nix
index 39394dd..8d219b8 100644
--- a/hosts/AZ-CLD-1/services/default.nix
+++ b/hosts/AZ-CLD-1/services/default.nix
@@ -3,7 +3,6 @@
     ./containers
 
     ./gitea.nix
-    ./it-tools.nix
     ./metabase.nix
     ./n8n.nix
     ./ntfy.nix