diff --git a/defaults/main.yml b/defaults/main.yml
index 7291c72..5ebc9b6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,50 +1,53 @@
 ---
 
+zabbix_proxy_installed: 'false' # set to false the first time you deploy proxy, then to true once it is deployed.  NOT NEEDED ANYMORE?
+
 #main
-zabbix_version: '6.4'
-zabbix_agent: 'true'
-zabbix_server: 'true'
-zabbix_proxy: 'false'
+zabbix_version: '6.0'
+zabbix_agent: 'true' # set to true if you want to deploy it.
+zabbix_server: 'true' # set to true if you want to deploy it.
+zabbix_proxy: 'false' # set to true if you want to deploy it.
 
 #Zabbix Server
+zabbix_server_pkg:
+      - zabbix-server-mysql
+      - zabbix-frontend-php
+      - zabbix-nginx-conf
+      - zabbix-sql-scripts
+      - gzip
+      - python3-pymysql
+
 zabbix_server_hostname: 'localhost'
-zabbix_server_name: 'Monitoring Monitoring'
+zabbix_server_name: 'Monitoring'
 zabbix_server_listen_port: '10051'
 zabbix_server_log_path: '/var/log/zabbix/zabbix_server.log'
 zabbix_server_log_size: '1' #in MB
 zabbix_debug_level: '3'
-#	0 - basic information about starting and stopping of Zabbix processes
-#	1 - critical information
-#	2 - error information
-#	3 - warnings
-#	4 - for debugging (produces lots of information)
-#	5 - extended debugging (produces even more information)
+#   0 - basic information about starting and stopping of Zabbix processes
+#   1 - critical information
+#   2 - error information
+#   3 - warnings
+#   4 - for debugging (produces lots of information)
+#   5 - extended debugging (produces even more information)
 zabbix_server_db_host: 'localhost'
 zabbix_server_db_plugin: 'mysql'
 zabbix_server_db_port: '0'
 zabbix_server_db_name: 'zabbix'
 zabbix_server_db_user: 'zabbixadmin'
 zabbix_server_db_passwd: 'changeme'
-zabbix_server_pollers: '5' #	Number of pre-forked instances of pollers.
+zabbix_server_pollers: '5' # Number of pre-forked instances of pollers.
 zabbix_server_ipmi_pollers: '0'
 zabbix_server_timeout: '4'
-zabbix_server_alert_scripts: '/usr/lib/zabbix/alertscripts/usr/lib/zabbix/alertscripts'
+zabbix_server_alert_scripts: '/usr/lib/zabbix/alertscripts'
 zabbix_server_external_scripts: '/usr/lib/zabbix/externalscripts'
 zabbix_server_fping: '/usr/bin/fping'
 zabbix_server_fping6: '/usr/bin/fping6'
 zabbix_server_queries_slow: '3000'
 zabbix_cachesize: '8M'
 
-zabbix_server_apt:
-  - zabbix-server-mysql
-  - zabbix-frontend-php
-  - zabbix-nginx-conf 
-  - zabbix-sql-scripts
-  - gzip
-  - python3-pymysql
 #Zabbix Client
-zabbix_agent_params:
-  - name: "container"
+zabbix_web_listen: '8080'
+zabbix_web_servername: 'example.com'
 
 zabbix_agent_pid: '/var/run/zabbix/zabbix_agentd.pid'
 zabbix_agent_logfile: '/var/log/zabbix/zabbix_agentd.log'
@@ -57,15 +60,19 @@ zabbix_agent_pkg:
     - gzip
     - zabbix-get
     - zabbix-sender
-zabbix_client_pkg:
-    - zabbix-agent
-    - gzip
 
 #Zabbix Scripts
+zabbix_agent_params: # this deploys userparameters
+  - name: "container" # this one is useful for LXC containers
+
 zabbix_scripts_deploy: 'false'
-zabbix_scripts_repo: 'https://git.disroot.org/Disroot/zabbix-scripts.git'
+zabbix_scripts_repo: '' # add your script repo address here
 zabbix_scripts_dir: '/usr/local/bin/zabbix-scripts'
-zabbix_scripts_version: 'master'
+zabbix_scripts_version: 'main'
+#zabbix_scripts_config_items: # Uncomment those if you want to add more config items from your scripts
+#  - key: ''
+#    value: ''
+
 #Zabbix Proxy
 zabbix_proxy_pkg:
       - zabbix-proxy-mysql
@@ -82,23 +89,30 @@ zabbix_proxy_debug_level: '3'
 zabbix_proxy_db_host: 'localhost'
 zabbix_proxy_db_name: 'zabbix_proxy'
 zabbix_proxy_db_user: 'zabbixproxyadmin'
-zabbix_proxy_db_passwd: 'dupa123'
+zabbix_proxy_db_passwd: 'changeme'
 zabbix_proxy_local_buffer: '0'
 zabbix_proxy_offline_buffer: '1'
-zabbix_proxy_heartbeat_freq: '60'
 zabbix_proxy_config_freq: '3600'
 zabbix_proxy_data_sernder_freq: '1'
 zabbix_proxy_start_pollers: '5'
 zabbix_proxy_ipmi_pollers: '0'
 
-# MARIADB CONFIG
+# PHP
+zabbix_pm: 'dynamic'
+zabbix_pm_max_children: '50'
+zabbix_pm_start_servers: '5'
+zabbix_pm_min_spare_servers: '5'
+zabbix_pm_max_spare_servers: '35'
+zabbix_pm_max_requests: '200'
+
+#MariaDB
 mariadb_databases:
   - name: '{{ zabbix_server_db_name }}'
-    collation: 'utf8_general_ci' # should it be utf8_bin?
-    encoding: 'utf8'
+    collation: 'utf8mb4_bin'
+    encoding: 'utf8mb4'
   - name: '{{ zabbix_proxy_db_name }}'
-    collation: 'utf8_general_ci'
-    encoding: 'utf8'
+    collation: 'utf8mb4_bin'
+    encoding: 'utf8mb4'
 
 mariadb_users:
   - name: '{{ zabbix_server_db_user }}'