diff --git a/home-manager/homeserver/containers/gitea.nix b/home-manager/homeserver/containers/gitea.nix
index d1c8b49..639a06d 100644
--- a/home-manager/homeserver/containers/gitea.nix
+++ b/home-manager/homeserver/containers/gitea.nix
@@ -13,7 +13,7 @@
     };
     containers = {
       gitea = {
-        image = "docker.gitea.com/gitea:latest-rootless";
+        image = "docker.gitea.com/gitea:latest";
         autoUpdate = "registry";
         network = [
           "gitea-net"
@@ -21,12 +21,13 @@
         ];
         ports = [
           "3000:3000"
-          "2222:2222"
+          "2222:22"
         ];
+        environment = {
+          TZ = "Europe/Dublin";
+        };
         volumes = [
-          "/home/cianh/gitea/data:/var/lib/gitea"
-          "/home/cianh/gitea/config:/etc/gitea"
-          "/etc/timezone:/etc/timezone:ro"
+          "/home/cianh/gitea:/data"
           "/etc/localtime:/etc/localtime:ro"
         ];
       };
diff --git a/home-manager/homeserver/containers/monitoring.nix b/home-manager/homeserver/containers/monitoring.nix
index 78118b6..c8df255 100644
--- a/home-manager/homeserver/containers/monitoring.nix
+++ b/home-manager/homeserver/containers/monitoring.nix
@@ -16,7 +16,7 @@
         image = "docker.io/grafana/grafana:latest";
         autoUpdate = "registry";
         network = ["grafana-net"];
-        ports = ["3000:3000"];
+        ports = ["3100:3000"];
         user = "1000:1000";
         volumes = [
           "/home/cianh/grafana:/var/lib/grafana:Z"