diff --git a/states/zabbix/defaults.yaml b/states/zabbix/defaults.yaml
index e7d4c38..a70748f 100644
--- a/states/zabbix/defaults.yaml
+++ b/states/zabbix/defaults.yaml
@@ -1,7 +1,7 @@
 ---
 zabbix:
   server:
-    enabled: false
+    enable: false
     user: zabbix
     group: zabbix
     pkgs:
@@ -11,12 +11,13 @@ zabbix:
       DBHost: zabbix
       DBName: zabbix
       DBPassword: zabbix
+      DBPort: 5433
       DBUser: zabbix
       LogFile: /var/log/zabbix/zabbix_server.log
       LogType: file
       PidFile: /run/zabbix/zabbix_server.pid
   agent:
-    enabled: true
+    enable: true
     user: zabbix
     group: zabbix
     pkgs:
diff --git a/states/zabbix/init.sls b/states/zabbix/init.sls
index 08a5a54..eb8e148 100644
--- a/states/zabbix/init.sls
+++ b/states/zabbix/init.sls
@@ -1,13 +1,13 @@
 ---
 {%- from "zabbix/map.jinja" import zabbix with context %}
 include:
-{% if zabbix.server.enabled %}
+{% if zabbix.server.enable %}
   - repos
   - postgresql
   - php
   - .server
 {% endif %}
-{% if zabbix.agent.enabled %}
+{% if zabbix.agent.enable %}
   - repos
   - .agent
 {% endif %}