diff --git a/zabbix/data/postgres/.gitkeep b/zabbix/data/postgres/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/zabbix/docker-compose.yml b/zabbix/docker-compose.yml
new file mode 100644
index 0000000..543466c
--- /dev/null
+++ b/zabbix/docker-compose.yml
@@ -0,0 +1,56 @@
+version: "3.7"
+
+services:
+
+  app_proxy:
+    environment:
+      APP_HOST: zabbix_zabbix-frontend_1
+      APP_PORT: 8080
+
+  zabbix-frontend:
+    image: zabbix/zabbix-web-nginx-pgsql:7.0.3-alpine@sha256:f541682b9cb5a7543153235c889de2f090b30b91ed93d0596409d624b29592a6
+    hostname: zabbix-frontend
+    restart: on-failure
+    environment:
+      DB_SERVER_HOST: zabbix-database
+      POSTGRES_USER: zabbix
+      POSTGRES_PASSWORD: zabbix
+      ZBX_SERVER_HOST: zabbix-server
+      PHP_TZ: UTC
+    depends_on:
+      - zabbix-server
+      - zabbix-database
+
+  zabbix-server:
+    image: zabbix/zabbix-server-pgsql:7.0.3-alpine@sha256:d6235c964a025d7734c5dad3a5c94e0c016ac3fde7ac4e6ae2101cb7d336b812
+    hostname: zabbix-server
+    restart: on-failure
+    init: true
+    environment:
+      DB_SERVER_HOST: zabbix-database
+      POSTGRES_USER: zabbix
+      POSTGRES_PASSWORD: zabbix
+    ports:
+      - "10050:10050"
+    depends_on:
+      - zabbix-database
+
+  zabbix-agent:
+    image: zabbix/zabbix-agent2:7.0.3-alpine@sha256:8dddb7d0980c2197ea0e7c1ed76dbca4930a0f87a094a05be2b0f63bc1ac519f
+    hostname: zabbix-agent
+    restart: on-failure
+    init: true
+    environment:
+      ZBX_HOSTNAME: zabbix-agent
+      ZBX_SERVER_HOST: zabbix-server
+
+  zabbix-database:
+    image: postgres:13.16-alpine3.20@sha256:e04acf5744305c9c6a19cedaa23d70a3a74b94cf62084e284793be756087aaa2
+    hostname: zabbix-database
+    restart: on-failure
+    environment:
+      POSTGRES_PASSWORD: zabbix
+      POSTGRES_USER: zabbix
+      POSTGRES_DB: zabbix
+    volumes:
+      - ${APP_DATA_DIR}/data/postgres:/var/lib/postgresql/data
diff --git a/zabbix/umbrel-app.yml b/zabbix/umbrel-app.yml
new file mode 100644
index 0000000..d40cc5e
--- /dev/null
+++ b/zabbix/umbrel-app.yml
@@ -0,0 +1,50 @@
+manifestVersion: 1.1
+id: zabbix
+category: networking
+name: Zabbix
+tagline: The all-in-one, open-source solution that lets you monitor anything
+version: "7.0.3"
+description: >-
+  ⚠️ Zabbix may take a few minutes to initialize after installation. Please be patient.
+  
+
+  An enterprise-class, open-source distributed monitoring solution that’s designed to monitor the performance and availability of network devices, servers, services, and other IT resources.
+  Zabbix is a flexible solution that can monitor anything from a simple, standalone application to a large-scale environment, with features including:
+
+
+  - Resource discovery: Discover network entities, server resources, and onboard/offboard devices. Use out-of-the-box integrations (templates) to monitor anything form a low-level device to a SAAS service.
+  
+  - Metric acquisition: Use an agent or agent-less approach for metric acquisition from any source – devices, sensors, operating systems, virtualization platforms, container platforms like Docker, Kubernetes, cloud infrastructures, databases, webpages, Java ecosystems, application servers, API endpoints, business applications, and many more.
+  
+  - Root cause analysis and problem detection: Count on high-performance, real-time problem detection that correlates both existing and incoming problems and performs root cause analyses.
+  
+  - Incidents, alerts, and notifications: Receive an alert when an issue is triggered (proactively or post-mortem) in the ecosystem. Use multiple messaging channels (including Slack, JIRA, Microsoft Teams, email or text messages) to get notified about the different types of events occurring in your environment.
+  
+  - “Single pane of glass” overview: Visualize collected data and monitoring events in graphs, lists, geomaps, and network topology maps.
+  
+  - Multitenancy and distributed monitoring: Enjoy the convenience of one monitoring solution for multiple data centers, departments, and organizations, and monitor remote locations behind firewalls with remote command execution capability.
+  
+  - Unparalleled flexibility: Adapt Zabbix to your needs and utilize built-in functionalities, including the ability to stream metrics and events over HTTP, reporting, auditing, security, service SLA calculations, and many more.
+
+
+  ⚙️ Configuration:
+
+
+  The Zabbix Agent listens on port 10050. To monitor the Zabbix server itslelf, navigate to Monitoring > Hosts within Zabbix, and modify the "Zabbix server" host by adding the DNS name "zabbix_zabbix-server_1" and toggling the "Connect to DNS" option.
+developer: Zabbix LLC
+website: https://www.zabbix.com/
+dependencies: []
+repo: https://github.com/zabbix/zabbix
+support: https://www.zabbix.com/support
+port: 10052
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+path: ""
+defaultUsername: "Admin"
+defaultPassword: "zabbix"
+torOnly: false
+releaseNotes: ""
+submitter: DavidGarciaCat
+submission: https://github.com/getumbrel/umbrel-apps/pull/1376