diff --git a/gitea.yaml b/gitea.yaml
index 1575a99..0701024 100755
--- a/gitea.yaml
+++ b/gitea.yaml
@@ -14,6 +14,7 @@
         recreate: true
         restart_policy: unless-stopped
         image: postgres:14.2
+        cgroupns_mode: host
         env:
           USER_UID: "1000"
           USER_GID: "1000"
@@ -33,8 +34,7 @@
         recreate: true
         restart_policy: always
         image: ghcr.io/noenv/gitea:1.20.3
-        published_ports:
-          - "3000:3000"
+        cgroupns_mode: host
         env:
           APP_NAME: "Sean's Code"
           USER_UID: "1000"
diff --git a/netdata.yaml b/netdata.yaml
index 30c1b9e..479ccd0 100755
--- a/netdata.yaml
+++ b/netdata.yaml
@@ -13,21 +13,21 @@
         name: "{{ stack_prefix_name }}netdata"
         recreate: true
         restart_policy: unless-stopped
-        image: netdata/netdata:1.34
-        hostname: monitor.gopoop.org
-        capabilities:
-          - SYS_PTRACE
-        security_opts:
-          - apparmor=unconfined
+        image: docker.io/netdata/netdata:v1.42
+        hostname: "{{ stack_prefix_name }}netdata"
         networks:
           - name: "{{ stack_prefix_name }}{{ docker_internal_network }}"
-        env:
-          PGID: "998"
+        pid_mode: host
+        security_opts:
+          - apparmor=unconfined
+        capabilities:
+          - SYS_PTRACE
+          - SYS_ADMIN
         mounts:
           - source: /var/run/docker.sock
             target: /var/run/docker.sock:ro
             type: bind
-          - target: /etc/netdata:ro
+          - target: /etc/netdata
             source: /home/server/netdataconfig/netdata
             type: bind
           - target: /var/lib/netdata