diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
index 007f6a4c8..ef107604b 100644
--- a/.github/workflows/agent.yml
+++ b/.github/workflows/agent.yml
@@ -30,6 +30,7 @@ jobs:
           - debian10
         version:
             - v60
+            - v65
         scenario_name:
           - default
           - autopsk
diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
index 206e1dea1..924845d18 100644
--- a/.github/workflows/javagateway.yml
+++ b/.github/workflows/javagateway.yml
@@ -30,10 +30,16 @@ jobs:
           - debian10
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
           - interpreter: python
             container: centos7
+        exclude:
+          - container: debian10
+            version: v65
+          - container: centos7
+            version: v65
         collection_role:
           - zabbix_javagateway
     steps:
diff --git a/.github/workflows/plugins-integration.yml b/.github/workflows/plugins-integration.yml
index d2276fb67..dcb2da773 100644
--- a/.github/workflows/plugins-integration.yml
+++ b/.github/workflows/plugins-integration.yml
@@ -20,7 +20,8 @@ jobs:
       fail-fast: false
       matrix:
         zabbix_container:
-          - version: "6.0"
+          - version: "6.0-latest"
+          - version: "trunk"
         ansible:
           # https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-changelogs
           - stable-2.14
@@ -50,7 +51,7 @@ jobs:
 
       # For Zabbix integration tests we need to test against different versions of
       # the Zabbix server. To do this we spin up a Docker container using the `matrix`
-      # of version and ports specified earlier.
+      # of version and ports specified earlier. 
       - name: Zabbix container server provisioning
         uses: isbang/compose-action@v1.5.0
         with:
diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
index 0a15dd092..8d4bc94e8 100644
--- a/.github/workflows/proxy.yml
+++ b/.github/workflows/proxy.yml
@@ -36,6 +36,7 @@ jobs:
           - sqlite3
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
           - interpreter: python
@@ -43,6 +44,10 @@ jobs:
         exclude:
           - container: debian12
             version: v62
+          - container: centos7
+            version: v65
+          - container: debian10
+            version: v65
     steps:
       - name: Check out code
         uses: actions/checkout@v4
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index 0b132a042..68c2415e8 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -34,8 +34,12 @@ jobs:
           - pgsql
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
+        exclude:
+          - container: debian10
+            version: v65
     steps:
       - name: Check out code
         uses: actions/checkout@v4
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index a865da716..c6c5dca3b 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -36,8 +36,13 @@ jobs:
           - nginx
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
+        exclude:
+          - container: debian10
+            version: v65
+
     steps:
       - name: Check out code
         uses: actions/checkout@v4
diff --git a/docker-compose.yml b/docker-compose.yml
index 512e4877f..ff009e257 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       POSTGRES_USER: "zabbix"
       POSTGRES_PASSWORD: "zabbix"
   zabbix-server:
-    image: zabbix/zabbix-server-pgsql:ubuntu-${zabbix_version}-latest
+    image: zabbix/zabbix-server-pgsql:ubuntu-${zabbix_version}
     environment:
       DB_SERVER_HOST: "zabbix-db"
       POSTGRES_USER: "zabbix"
@@ -19,7 +19,7 @@ services:
     links:
       - "zabbix-db"
   zabbix-web:
-    image: zabbix/zabbix-web-nginx-pgsql:ubuntu-${zabbix_version}-latest
+    image: zabbix/zabbix-web-nginx-pgsql:ubuntu-${zabbix_version}
     environment:
       DB_SERVER_HOST: "zabbix-db"
       POSTGRES_USER: "zabbix"
diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md
index 4f3cea6f1..5676bdfd1 100644
--- a/docs/ZABBIX_AGENT_ROLE.md
+++ b/docs/ZABBIX_AGENT_ROLE.md
@@ -90,16 +90,16 @@ To successfully complete the install the role requires `python-netaddr` on the c
 
 See the following list of supported Operating systems with the Zabbix releases:
 
-| Zabbix              | 6.0 |
-|---------------------|-----|
-| Red Hat Fam 9       | V  |
-| Red Hat Fam 8       | V  |
-| Red Hat Fam 7       | V  |
-| Ubuntu 22.04 jammy  | V  |
-| Ubuntu 20.04 focal  | V  |
-| Debian 12 bookworm  | V  |
-| Debian 11 bullseye  | V  |
-| Debian 10 buster    | V  |
+| Zabbix              | 6.0 | 7.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Red Hat Fam 7       |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
+| Debian 10 buster    |  V  |  V  |
 
 
 # Getting started
diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md
index c792f9a96..8e6dda984 100644
--- a/docs/ZABBIX_JAVAGATEWAY_ROLE.md
+++ b/docs/ZABBIX_JAVAGATEWAY_ROLE.md
@@ -34,16 +34,16 @@ So, you'll need one of those operating systems.. :-)
 
 See the following list of supported Operating systems with the Zabbix releases.
 
-| Zabbix              |6.0 |
-|---------------------|-----|
-| Red Hat Fam 9       | V  |
-| Red Hat Fam 8       | V  |
-| Red Hat Fam 7       | V  |
-| Ubuntu 22.04 jammy  | V  |
-| Ubuntu 20.04 focal  | V  |
-| Debian 12 bookworm  | V  |
-| Debian 11 bullseye  | V  |
-| Debian 10 buster    | V  |
+| Zabbix              | 6.0 | 7.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Red Hat Fam 7       |  V  |     |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
+| Debian 10 buster    |  V  |     |
 
 # Role Variables
 
diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md
index 341fc1984..b166ba6c8 100644
--- a/docs/ZABBIX_PROXY_ROLE.md
+++ b/docs/ZABBIX_PROXY_ROLE.md
@@ -77,16 +77,16 @@ ansible-galaxy collection install community.postgresql
 
 See the following list of supported Operating systems with the Zabbix releases.
 
-| Zabbix              |6.0 |
-|---------------------|-----|
-| Red Hat Fam 9       |  V  |
-| Red Hat Fam 8       |  V  |
-| Red Hat Fam 7       |  V  |
-| Ubuntu 22.04 jammy  |  V  |
-| Ubuntu 20.04 focal  |  V  |
-| Debian 12 bookworm  |  V  |
-| Debian 11 bullseye  |  V  |
-| Debian 10 buster    |  V  |
+| Zabbix              | 6.0 | 7.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Red Hat Fam 7       |  V  |     |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
+| Debian 10 buster    |  V  |     |
 
 # Role Variables
 
@@ -332,8 +332,12 @@ The following table lists all variables that are exposed to modify the configura
 | LogRemoteCommands | zabbix_proxy_logremotecommands || |
 | LogSlowQueries | zabbix_proxy_logslowqueries || |
 | LogType | zabbix_proxy_logtype | file| |
+| MaxConcurrentChecksPerPoller | zabbix_proxy_maxconcurrentchecksperpoller || |
 | PidFile | zabbix_proxy_pidfile | /var/run/zabbix/zabbix_proxy.pid| |
+| ProxyBufferMode | zabbix_proxy_proxybuffermode || |
 | ProxyLocalBuffer | zabbix_proxy_proxylocalbuffer |0| |
+| ProxyMemoryBufferAge | zabbix_proxy_proxymemorybufferage || |
+| ProxyMemoryBufferSize | zabbix_proxy_proxymemorybuffersize || |
 | ProxyMode | zabbix_proxy_proxymode || |
 | ProxyOfflineBuffer | zabbix_proxy_proxyofflinebuffer |1| |
 | Server | zabbix_proxy_server | 192.168.1.1| |
@@ -342,10 +346,12 @@ The following table lists all variables that are exposed to modify the configura
 | SourceIP | zabbix_proxy_sourceip || |
 | SSHKeyLocation | zabbix_proxy_sshkeylocation || |
 | SSLCALocation | zabbix_proxy_sslcalocation || |
+| StartAgentPollers | zabbix_proxy_startagentpollers || |
 | SSLCertLocation | zabbix_proxy_sslcertlocation || |
 | SSLKeyLocation | zabbix_proxy_sslkeylocation || |
 | StartDBSyncers | zabbix_proxy_startdbsyncers |4| |
 | StartDiscoverers | zabbix_proxy_startdiscoverers |1| |
+| StartHTTPAgentPollers | zabbix_proxy_starthttpagentpollers || |
 | StartHTTPPollers | zabbix_proxy_starthttppollers |1| |
 | StartIPMIPollers | zabbix_proxy_startipmipollers |0| |
 | StartJavaPollers | zabbix_proxy_startjavapollers || |
@@ -354,6 +360,7 @@ The following table lists all variables that are exposed to modify the configura
 | StartPollers | zabbix_proxy_startpollers |5| |
 | StartPollersUnreachable | zabbix_proxy_startpollersunreachable |1| |
 | StartPreprocessors | zabbix_proxy_startpreprocessors |3| |
+| StartSNMPPollers | zabbix_proxy_startsnmppollers || |
 | StartSNMPTrapper | zabbix_proxy_startsnmptrapper || |
 | StartTrappers | zabbix_proxy_starttrappers |5| |
 | StartVMwareCollectors | zabbix_proxy_startvmwarecollectors || |
diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md
index 22ecd0f56..f06dd69e5 100644
--- a/docs/ZABBIX_SERVER_ROLE.md
+++ b/docs/ZABBIX_SERVER_ROLE.md
@@ -75,15 +75,15 @@ ansible-galaxy collection install community.postgresql
 
 See the following list of supported Operating systems with the Zabbix releases:
 
-| Zabbix              | 6.0 |
-|---------------------|-----|
-| Red Hat Fam 9       |  V  |
-| Red Hat Fam 8       |  V  |
-| Ubuntu 22.04 jammy  |  V  |
-| Ubuntu 20.04 focal  |  V  |
-| Debian 12 bookworm  |  V  |
-| Debian 11 bullseye  |  V  |
-| Debian 10 buster    |  V  |
+| Zabbix              | 6.0 | 7.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
+| Debian 10 buster    |  V  |     |
 
 # Installation
 
@@ -337,6 +337,7 @@ The following table lists all variables that are exposed to modify the configura
 |SSHKeyLocation | zabbix_server_sshkeylocation | |  |
 |SSLCALocation | zabbix_server_sslcalocation | |  |
 |SSLCertLocation | zabbix_server_sslcertlocation | ${datadir}/zabbix/ssl/certs |  |
+|StartAgentPollers | zabbix_server_startagentpollers | | |
 |SSLKeyLocation | zabbix_server_sslkeylocation | ${datadir}/zabbix/ssl/keys |  |
 |StartAlerters | zabbix_server_startalerters | |  |
 |StartConnectors | zabbix_server_connectors | | Version 6.4 or later |
@@ -344,7 +345,9 @@ The following table lists all variables that are exposed to modify the configura
 |StartDiscoverers | zabbix_server_startdiscoverers | 1 |  |
 |StartEscalators | zabbix_server_startescalators | 1 |  |
 |StartHistoryPollers | zabbix_server_starthistorypollers | |  |
+|StartHTTPAgentPollers | zabbix_server_starthttpagentpollers | | |
 |StartHTTPPollers | zabbix_server_starthttppollers | 1 |  |
+|StartHTTPAgentPollers | zabbix_server_starthttpagentpollers | | |
 |StartIPMIPollers | zabbix_server_startipmipollers | 0 |  |
 |StartJavaPollers | zabbix_server_startjavapollers | 0 |  |
 |StartLLDProcessors | zabbix_server_startlldprocessors | |  |
@@ -355,6 +358,7 @@ The following table lists all variables that are exposed to modify the configura
 |StartPreprocessors | zabbix_server_startpreprocessors | |  |
 |StartProxyPollers | zabbix_server_startproxypollers | |  |
 |StartReportWriters | zabbix_server_startreportwriters | 0 |  |
+|StartSNMMPAgentPollers | zabbix_server_startsnmpagentpollers | | |
 |StartSNMPTrapper | zabbix_server_startsnmptrapper | 0 |  |
 |StartTimers | zabbix_server_starttimers | 1 |  |
 |StartTrappers | zabbix_server_starttrappers | 5 |  |
diff --git a/docs/ZABBIX_WEB_ROLE.md b/docs/ZABBIX_WEB_ROLE.md
index 411f312df..adfeeeef2 100644
--- a/docs/ZABBIX_WEB_ROLE.md
+++ b/docs/ZABBIX_WEB_ROLE.md
@@ -54,15 +54,15 @@ ansible-galaxy collection install community.general
 
 See the following list of supported Operating Systems with the Zabbix releases.
 
-| Zabbix              | 6.0 |
-|---------------------|-----|
-| Red Hat Fam 9       |  V  |
-| Red Hat Fam 8       |  V  |
-| Ubuntu 22.04 jammy  |  V  |
-| Ubuntu 20.04 focal  |  V  |
-| Debian 12 bookworm  |  V  |
-| Debian 11 bullseye  |  V  |
-| Debian 10 buster    |  V  |
+| Zabbix              | 6.0 | 7.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
+| Debian 10 buster    |  V  |    |
 
 # Installation
 
diff --git a/molecule/zabbix_agent_tests/common/molecule.yml b/molecule/zabbix_agent_tests/common/molecule.yml
index cba1ac16e..59c469013 100644
--- a/molecule/zabbix_agent_tests/common/molecule.yml
+++ b/molecule/zabbix_agent_tests/common/molecule.yml
@@ -14,7 +14,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - agent
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v65}
 
 provisioner:
   name: ansible
@@ -37,6 +37,8 @@ provisioner:
         zabbix_agent_tlsaccept: psk
       v60:
         zabbix_agent_version: 6.0
+      v65:
+        zabbix_agent_version: 6.5
 scenario:
   test_sequence:
     - dependency
diff --git a/molecule/zabbix_javagateway/molecule.yml b/molecule/zabbix_javagateway/molecule.yml
index 21229e86d..971995a5f 100644
--- a/molecule/zabbix_javagateway/molecule.yml
+++ b/molecule/zabbix_javagateway/molecule.yml
@@ -13,7 +13,7 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v65}
       - ${MY_MOLECULE_INTERPRETER:-python3}
 provisioner:
   name: ansible
@@ -28,6 +28,8 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python
       v60:
         zabbix_javagateway_version: 6.0
+      v65:
+        zabbix_javagateway_version: 6.5
 
 verifier:
   name: testinfra
diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml
index 7d7756231..c8c9996f6 100644
--- a/molecule/zabbix_proxy/molecule.yml
+++ b/molecule/zabbix_proxy/molecule.yml
@@ -13,7 +13,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v65}
 
 provisioner:
   name: ansible
@@ -28,6 +28,8 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python
       v60:
         zabbix_proxy_version: 6.0
+      v65:
+        zabbix_proxy_version: 6.5
       mysql:
         zabbix_proxy_dbname: zabbix
         zabbix_proxy_dbuser: zabbix-dbuser
diff --git a/molecule/zabbix_proxy/tests/test_default.py b/molecule/zabbix_proxy/tests/test_default.py
index 9140e1edc..b619340a0 100644
--- a/molecule/zabbix_proxy/tests/test_default.py
+++ b/molecule/zabbix_proxy/tests/test_default.py
@@ -23,7 +23,10 @@ def test_zabbix_package(host):
     database = ansible_data['zabbix_proxy_database']
 
     zabbix_proxy = host.package(f'zabbix-proxy-%s' % database)
-    assert str(version) in zabbix_proxy.version
+    try:
+        assert str(version) in zabbix_proxy.version
+    except:
+        assert "7.0" in zabbix_proxy.version
 
 
 def test_zabbix_proxy_dot_conf(host):
diff --git a/molecule/zabbix_server/molecule.yml b/molecule/zabbix_server/molecule.yml
index fca4a17fc..1bc798653 100644
--- a/molecule/zabbix_server/molecule.yml
+++ b/molecule/zabbix_server/molecule.yml
@@ -13,7 +13,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v65}
       - ${MY_MOLECULE_INTERPRETER:-python3}
 
 provisioner:
@@ -29,6 +29,8 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python
       v60:
         zabbix_server_version: 6.0
+      v65:
+        zabbix_server_version: 6.5
       mysql:
         zabbix_server_dbname: zabbix
         zabbix_server_dbuser: zabbix-dbuser
diff --git a/molecule/zabbix_server/tests/test_default.py b/molecule/zabbix_server/tests/test_default.py
index 11051926f..85681e1a2 100644
--- a/molecule/zabbix_server/tests/test_default.py
+++ b/molecule/zabbix_server/tests/test_default.py
@@ -25,7 +25,10 @@ def test_zabbix_package(host):
     database = ansible_data['zabbix_server_database']
 
     zabbix_server = host.package(f'zabbix-server-%s' % database)
-    assert str(version) in zabbix_server.version
+    try:
+        assert str(version) in zabbix_server.version
+    except:  # Allows for testing of the 7.0 beta
+        assert "7.0" in zabbix_server.version
 
 
 def test_zabbix_server_dot_conf(host):
diff --git a/molecule/zabbix_web/molecule.yml b/molecule/zabbix_web/molecule.yml
index 2b8b83bd4..a15fe4117 100644
--- a/molecule/zabbix_web/molecule.yml
+++ b/molecule/zabbix_web/molecule.yml
@@ -21,7 +21,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v65}
       - ${MY_MOLECULE_INTERPRETER:-python3}
       - ${MY_MOLECULE_WEB_SERVER:-apache}
 
@@ -41,6 +41,9 @@ provisioner:
       v60:
         zabbix_server_version: 6.0
         zabbix_web_version: 6.0
+      v65:
+        zabbix_server_version: 6.5
+        zabbix_web_version: 6.5
       mysql:
         zabbix_server_database: mysql
         zabbix_server_dbport: 3306
diff --git a/molecule/zabbix_web/tests/test_default.py b/molecule/zabbix_web/tests/test_default.py
index f4882b97b..774a80dcd 100644
--- a/molecule/zabbix_web/tests/test_default.py
+++ b/molecule/zabbix_web/tests/test_default.py
@@ -14,7 +14,10 @@ def test_zabbix_package(host):
     webserver = ansible_data['zabbix_web_http_server']
 
     zabbix_web = host.package(f'zabbix-%s-conf' % webserver)
-    assert str(version) in zabbix_web.version
+    try:
+        assert str(version) in zabbix_web.version
+    except:
+        assert "7.0" in zabbix_web.version
 
 
 def test_zabbix_web(host):
diff --git a/roles/zabbix_agent/tasks/RedHat.yml b/roles/zabbix_agent/tasks/RedHat.yml
index f23cb46ad..275463b3e 100644
--- a/roles/zabbix_agent/tasks/RedHat.yml
+++ b/roles/zabbix_agent/tasks/RedHat.yml
@@ -27,6 +27,11 @@
   tags:
     - always
 
+- name: TEMP Update Version Number
+  ansible.builtin.set_fact:
+    zabbix_agent_version: 7.0
+  when: zabbix_agent_version == 6.5
+
 - name: "RedHat | Installing zabbix-agent"
   ansible.builtin.package:
     pkg:
diff --git a/roles/zabbix_agent/vars/Debian.yml b/roles/zabbix_agent/vars/Debian.yml
index 0294cfa9d..11bd62d51 100644
--- a/roles/zabbix_agent/vars/Debian.yml
+++ b/roles/zabbix_agent/vars/Debian.yml
@@ -9,19 +9,24 @@ zabbix_agent2_conf: zabbix_agent2.conf
 zabbix_valid_agent_versions:
   # Debian
   "12":
+    - 6.5
     - 6.0
 
   "11":
+    - 6.5
     - 6.0
 
   "10":
+    - 6.5
     - 6.0
 
   # Ubuntu
   "22":
+    - 6.5
     - 6.0
 
   "20":
+    - 6.5
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
diff --git a/roles/zabbix_agent/vars/RedHat.yml b/roles/zabbix_agent/vars/RedHat.yml
index d78a658e8..d42e04da2 100644
--- a/roles/zabbix_agent/vars/RedHat.yml
+++ b/roles/zabbix_agent/vars/RedHat.yml
@@ -8,8 +8,11 @@ zabbix_agent2_conf: zabbix_agent2.conf
 
 zabbix_valid_agent_versions:
   "9":
+    - 6.5
     - 6.0
   "8":
+    - 6.5
     - 6.0
   "7":
+    - 6.5
     - 6.0
diff --git a/roles/zabbix_javagateway/tasks/RedHat.yml b/roles/zabbix_javagateway/tasks/RedHat.yml
index 96d9d3928..64c16b100 100644
--- a/roles/zabbix_javagateway/tasks/RedHat.yml
+++ b/roles/zabbix_javagateway/tasks/RedHat.yml
@@ -20,6 +20,11 @@
   tags:
     - install
 
+- name: TEMP Update Version Number
+  ansible.builtin.set_fact:
+    zabbix_javagateway_version: 7.0
+  when: zabbix_javagateway_version == 6.5
+
 - name: "RedHat | Installing zabbix-java-gateway"
   ansible.builtin.package:
     pkg: zabbix-java-gateway
diff --git a/roles/zabbix_javagateway/vars/Debian.yml b/roles/zabbix_javagateway/vars/Debian.yml
index 0a8f64eee..ae7ab4228 100644
--- a/roles/zabbix_javagateway/vars/Debian.yml
+++ b/roles/zabbix_javagateway/vars/Debian.yml
@@ -1,15 +1,19 @@
 zabbix_valid_javagateway_versions:
   # Debian
   "12":
+    - 6.5
     - 6.0
   "11":
+    - 6.5
     - 6.0
   "10":
     - 6.0
   # Ubuntu
   "22":
+    - 6.5
     - 6.0
   "20":
+    - 6.5
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
diff --git a/roles/zabbix_javagateway/vars/RedHat.yml b/roles/zabbix_javagateway/vars/RedHat.yml
index f47237382..0d9864c9f 100644
--- a/roles/zabbix_javagateway/vars/RedHat.yml
+++ b/roles/zabbix_javagateway/vars/RedHat.yml
@@ -1,8 +1,10 @@
 ---
 zabbix_valid_javagateway_versions:
   "9":
+    - 6.5
     - 6.0
   "8":
+    - 6.5
     - 6.0
   "7":
     - 6.0
diff --git a/roles/zabbix_proxy/tasks/RedHat.yml b/roles/zabbix_proxy/tasks/RedHat.yml
index da389e0c8..00392f7cb 100644
--- a/roles/zabbix_proxy/tasks/RedHat.yml
+++ b/roles/zabbix_proxy/tasks/RedHat.yml
@@ -47,6 +47,11 @@
   tags:
     - install
 
+- name: TEMP Update Version Number
+  ansible.builtin.set_fact:
+    zabbix_proxy_version: 7.0
+  when: zabbix_proxy_version == 6.5
+
 - name: Install packages for Zabbix Repository
   block:
     - name: "RedHat | Installing zabbix-proxy-{{ zabbix_proxy_database }}"
diff --git a/roles/zabbix_proxy/templates/zabbix_proxy.conf.j2 b/roles/zabbix_proxy/templates/zabbix_proxy.conf.j2
index 797f779df..edabb7e1f 100644
--- a/roles/zabbix_proxy/templates/zabbix_proxy.conf.j2
+++ b/roles/zabbix_proxy/templates/zabbix_proxy.conf.j2
@@ -49,8 +49,18 @@
 {{ (zabbix_proxy_logremotecommands is defined and zabbix_proxy_logremotecommands is not none) | ternary('','# ') }}LogRemoteCommands={{ zabbix_proxy_logremotecommands | default('') }}
 {{ (zabbix_proxy_logslowqueries is defined and zabbix_proxy_logslowqueries is not none) | ternary('','# ') }}LogSlowQueries={{ zabbix_proxy_logslowqueries | default('') }}
 {{ (zabbix_proxy_logtype is defined and zabbix_proxy_logtype is not none) | ternary('','# ') }}LogType={{ zabbix_proxy_logtype | default('') }}
+{% if zabbix_proxy_version is version('6.4', '>') %}
+{{ (zabbix_proxy_maxconcurrentchecksperpoller is defined and zabbix_proxy_maxconcurrentchecksperpoller is not none) | ternary('','# ') }}MaxConcurrentChecksPerPoller={{ zabbix_proxy_maxconcurrentchecksperpoller | default('') }}
+{% endif %}
 {{ (zabbix_proxy_pidfile is defined and zabbix_proxy_pidfile is not none) | ternary('','# ') }}PidFile={{ zabbix_proxy_pidfile | default('') }}
+{% if zabbix_proxy_version is version('6.4', '>') %}
+{{ (zabbix_proxy_proxybuffermode is defined and zabbix_proxy_proxybuffermode is not none) | ternary('','# ') }}ProxyBufferMode={{ zabbix_proxy_proxybuffermode | default('') }}
+{% endif %}
 {{ (zabbix_proxy_proxylocalbuffer is defined and zabbix_proxy_proxylocalbuffer is not none) | ternary('','# ') }}ProxyLocalBuffer={{ zabbix_proxy_proxylocalbuffer | default('') }}
+{% if zabbix_proxy_version is version('6.4', '>') %}
+{{ (zabbix_proxy_proxymemorybufferage is defined and zabbix_proxy_proxymemorybufferage is not none) | ternary('','# ') }}ProxyMemoryBufferAge={{ zabbix_proxy_proxymemorybufferage | default('') }}
+{{ (zabbix_proxy_proxymemorybuffersize is defined and zabbix_proxy_proxymemorybuffersize is not none) | ternary('','# ') }}ProxyMemoryBufferSize={{ zabbix_proxy_proxymemorybuffersize | default('') }}
+{% endif %}
 {{ (zabbix_proxy_proxymode is defined and zabbix_proxy_proxymode is not none) | ternary('','# ') }}ProxyMode={{ zabbix_proxy_proxymode | default('') }}
 {{ (zabbix_proxy_proxyofflinebuffer is defined and zabbix_proxy_proxyofflinebuffer is not none) | ternary('','# ') }}ProxyOfflineBuffer={{ zabbix_proxy_proxyofflinebuffer | default('') }}
 {{ (zabbix_proxy_server is defined and zabbix_proxy_server is not none) | ternary('','# ') }}Server={{ zabbix_proxy_server | default('') }}
@@ -59,10 +69,16 @@
 {{ (zabbix_proxy_sourceip is defined and zabbix_proxy_sourceip is not none) | ternary('','# ') }}SourceIP={{ zabbix_proxy_sourceip | default('') }}
 {{ (zabbix_proxy_sshkeylocation is defined and zabbix_proxy_sshkeylocation is not none) | ternary('','# ') }}SSHKeyLocation={{ zabbix_proxy_sshkeylocation | default('') }}
 {{ (zabbix_proxy_sslcalocation is defined and zabbix_proxy_sslcalocation is not none) | ternary('','# ') }}SSLCALocation={{ zabbix_proxy_sslcalocation | default('') }}
+{% if zabbix_proxy_version is version('6.4', '>') %}
+{{ (zabbix_proxy_startagentpollers is defined and zabbix_proxy_startagentpollers is not none) | ternary('','# ') }}StartAgentPollers={{ zabbix_proxy_startagentpollers | default('') }}
+{% endif %}
 {{ (zabbix_proxy_sslcertlocation is defined and zabbix_proxy_sslcertlocation is not none) | ternary('','# ') }}SSLCertLocation={{ zabbix_proxy_sslcertlocation | default('') }}
 {{ (zabbix_proxy_sslkeylocation is defined and zabbix_proxy_sslkeylocation is not none) | ternary('','# ') }}SSLKeyLocation={{ zabbix_proxy_sslkeylocation | default('') }}
 {{ (zabbix_proxy_startdbsyncers is defined and zabbix_proxy_startdbsyncers is not none) | ternary('','# ') }}StartDBSyncers={{ zabbix_proxy_startdbsyncers | default('') }}
 {{ (zabbix_proxy_startdiscoverers is defined and zabbix_proxy_startdiscoverers is not none) | ternary('','# ') }}StartDiscoverers={{ zabbix_proxy_startdiscoverers | default('') }}
+{% if zabbix_proxy_version is version('6.4', '>') %}
+{{ (zabbix_proxy_starthttpagentpollers is defined and zabbix_proxy_starthttpagentpollers is not none) | ternary('','# ') }}StartHTTPAgentPollers={{ zabbix_proxy_starthttpagentpollers | default('') }}
+{% endif %}
 {% if zabbix_proxy_version is version('6.0', '==') %}
 {{ (zabbix_proxy_starthistorypollers is defined and zabbix_proxy_starthistorypollers is not none) | ternary('','# ') }}={{ zabbix_proxy_starthistorypollers | default('') }}
 {% endif %}
@@ -74,6 +90,9 @@
 {{ (zabbix_proxy_startpollers is defined and zabbix_proxy_startpollers is not none) | ternary('','# ') }}StartPollers={{ zabbix_proxy_startpollers | default('') }}
 {{ (zabbix_proxy_startpollersunreachable is defined and zabbix_proxy_startpollersunreachable is not none) | ternary('','# ') }}StartPollersUnreachable={{ zabbix_proxy_startpollersunreachable | default('') }}
 {{ (zabbix_proxy_startpreprocessors is defined and zabbix_proxy_startpreprocessors is not none) | ternary('','# ') }}StartPreprocessors={{ zabbix_proxy_startpreprocessors | default('') }}
+{% if zabbix_proxy_version is version('6.4', '>') %}
+{{ (zabbix_proxy_startsnmppollers is defined and zabbix_proxy_startsnmppollers is not none) | ternary('','# ') }}StartSNMPPollers={{ zabbix_proxy_startsnmppollers | default('') }}
+{% endif %}
 {{ (zabbix_proxy_startsnmptrapper is defined and zabbix_proxy_startsnmptrapper is not none) | ternary('','# ') }}StartSNMPTrapper={{ zabbix_proxy_startsnmptrapper | default('') }}
 {{ (zabbix_proxy_starttrappers is defined and zabbix_proxy_starttrappers is not none) | ternary('','# ') }}StartTrappers={{ zabbix_proxy_starttrappers | default('') }}
 {{ (zabbix_proxy_startvmwarecollectors is defined and zabbix_proxy_startvmwarecollectors is not none) | ternary('','# ') }}StartVMwareCollectors={{ zabbix_proxy_startvmwarecollectors | default('') }}
diff --git a/roles/zabbix_proxy/vars/Debian.yml b/roles/zabbix_proxy/vars/Debian.yml
index d44fb6db7..a46a9cf72 100644
--- a/roles/zabbix_proxy/vars/Debian.yml
+++ b/roles/zabbix_proxy/vars/Debian.yml
@@ -1,23 +1,18 @@
 zabbix_valid_proxy_versions:
   # Debian
   "12":
-    - 6.4
+    - 6.5
     - 6.0
   "11":
-    - 6.4
-    - 6.2
+    - 6.5
     - 6.0
   "10":
-    - 6.4
-    - 6.2
     - 6.0
   "22":
-    - 6.4
-    - 6.2
+    - 6.5
     - 6.0
   "20":
-    - 6.4
-    - 6.2
+    - 6.5
     - 6.0
 
 mysql_client_pkgs:
diff --git a/roles/zabbix_proxy/vars/RedHat.yml b/roles/zabbix_proxy/vars/RedHat.yml
index 1753dc9bd..daeda0e5a 100644
--- a/roles/zabbix_proxy/vars/RedHat.yml
+++ b/roles/zabbix_proxy/vars/RedHat.yml
@@ -1,15 +1,11 @@
 zabbix_valid_proxy_versions:
   "9":
-    - 6.4
-    - 6.2
+    - 6.5
     - 6.0
   "8":
-    - 6.4
-    - 6.2
+    - 6.5
     - 6.0
   "7":
-    - 6.4
-    - 6.2
     - 6.0
 
 pgsql_depenencies:
diff --git a/roles/zabbix_proxy/vars/main.yml b/roles/zabbix_proxy/vars/main.yml
index 90779c270..874c8de19 100644
--- a/roles/zabbix_proxy/vars/main.yml
+++ b/roles/zabbix_proxy/vars/main.yml
@@ -1,7 +1,5 @@
 ---
 # vars file for zabbix_proxy
 db_file_path:
-  "62": "/usr/share/zabbix-sql-scripts/{{ zabbix_proxy_db_long }}/proxy.sql"
-  "64": "/usr/share/zabbix-sql-scripts/{{ zabbix_proxy_db_long }}/proxy.sql"
+  "65": "/usr/share/zabbix-sql-scripts/{{ zabbix_proxy_db_long }}/proxy.sql"
   "60": "/usr/share/zabbix-sql-scripts/{{ zabbix_proxy_db_long }}/proxy.sql"
-  "50": "/usr/share/doc/zabbix-proxy-{{ zabbix_proxy_database }}*/schema.sql.gz"
diff --git a/roles/zabbix_server/tasks/RedHat.yml b/roles/zabbix_server/tasks/RedHat.yml
index 89f1a2246..6f1610b3e 100644
--- a/roles/zabbix_server/tasks/RedHat.yml
+++ b/roles/zabbix_server/tasks/RedHat.yml
@@ -46,6 +46,11 @@
   tags:
     - install
 
+- name: TEMP Update Version Number
+  ansible.builtin.set_fact:
+    zabbix_server_version: 7.0
+  when: zabbix_server_version == 6.5
+
 - name: "RedHat | Installing zabbix-server-{{ zabbix_server_database }}"
   ansible.builtin.package:
     pkg: "{{ zabbix_server_package }}-{{ zabbix_server_version }}.{{ zabbix_server_version_minor }}"
diff --git a/roles/zabbix_server/tasks/mysql.yml b/roles/zabbix_server/tasks/mysql.yml
index f7a5b71be..7635a76af 100644
--- a/roles/zabbix_server/tasks/mysql.yml
+++ b/roles/zabbix_server/tasks/mysql.yml
@@ -60,6 +60,16 @@
   tags:
     - database
 
+- name: "MySQL | Get the file for create.sql"
+  ansible.builtin.shell: ls -1 {{ datafiles_path }}/server.sq*
+  changed_when: false
+  become: true
+  when:
+    - zabbix_server_database_sqlload | bool
+  register: ls_output_create
+  tags:
+    - database
+
 - name: MySQL | Get current database version
   ansible.builtin.shell: |
     mysql -h {{ zabbix_server_dbhost }} -u{{ zabbix_server_dbuser }} \
@@ -126,6 +136,53 @@
   tags:
     - database
 
+- name: "MySQL | Fetch sql create file"
+  fetch:
+    src: "{{ ls_output_create.stdout }}"
+    dest: /tmp/{{ role_name }}/
+    flat: true
+  become: true
+  when:
+    - delegated_dbhost != inventory_hostname
+    - zabbix_server_database_sqlload | bool
+    - mysql_schema_empty
+  tags:
+    - database
+
+- name: "MySQL | Copy sql create file"
+  ansible.builtin.copy:
+    src: /tmp/{{ role_name }}/
+    dest: "{{ ls_output_create.stdout | dirname }}"
+    mode: "0640"
+  delegate_to: "{{ delegated_dbhost }}"
+  become: true
+  when:
+    - delegated_dbhost != inventory_hostname
+    - zabbix_server_database_sqlload | bool
+    - mysql_schema_empty
+  tags:
+    - database
+
+- name: "MySQL | Create database and import file"
+  community.mysql.mysql_db:
+    login_host: "{{ zabbix_server_mysql_login_host | default(omit) }}"
+    login_user: "{{ zabbix_server_mysql_login_user }}"
+    login_password: "{{ zabbix_server_mysql_login_password }}"
+    login_port: "{{ zabbix_server_mysql_login_port | default(omit) }}"
+    login_unix_socket: "{{ zabbix_server_mysql_login_unix_socket | default(omit) }}"
+    name: "{{ zabbix_server_dbname }}"
+    encoding: "{{ zabbix_server_dbencoding }}"
+    collation: "{{ zabbix_server_dbcollation }}"
+    state: import
+    target: "{{ ls_output_create.stdout }}"
+    use_shell: false
+  when:
+    - zabbix_server_database_sqlload | bool
+    - mysql_schema_empty
+  delegate_to: "{{ delegated_dbhost }}"
+  tags:
+    - database
+
 - name: "MySQL | Revert innodb_default_row_format to previous value"
   community.mysql.mysql_variables:
     variable: innodb_default_row_format
diff --git a/roles/zabbix_server/templates/zabbix_server.conf.j2 b/roles/zabbix_server/templates/zabbix_server.conf.j2
index 9473e81cf..b8f0509ca 100644
--- a/roles/zabbix_server/templates/zabbix_server.conf.j2
+++ b/roles/zabbix_server/templates/zabbix_server.conf.j2
@@ -60,6 +60,9 @@
 {{ (zabbix_server_sourceip is defined and zabbix_server_sourceip is not none) | ternary('', '# ') }}SourceIP={{ zabbix_server_sourceip | default('') }}
 {{ (zabbix_server_sshkeylocation is defined and zabbix_server_sshkeylocation is not none) | ternary('', '# ') }}SSHKeyLocation={{ zabbix_server_sshkeylocation | default('') }}
 {{ (zabbix_server_sslcalocation is defined and zabbix_server_sslcalocation is not none) | ternary('', '# ') }}SSLCALocation={{ zabbix_server_sslcalocation | default('') }}
+{% if zabbix_server_version is version('6.4', '>') %}
+{{ (zabbix_server_startagentpollers is defined and zabbix_server_startagentpollers is not none) | ternary('', '# ') }}StartAgentPollers={{ zabbix_server_startagentpollers | default('') }}
+{% endif %}
 {{ (zabbix_server_sslcertlocation is defined and zabbix_server_sslcertlocation is not none) | ternary('', '# ') }}SSLCertLocation={{ zabbix_server_sslcertlocation | default('') }}
 {{ (zabbix_server_sslkeylocation is defined and zabbix_server_sslkeylocation is not none) | ternary('', '# ') }}SSLKeyLocation={{ zabbix_server_sslkeylocation | default('') }}
 {{ (zabbix_server_startalerters is defined and zabbix_server_startalerters is not none) | ternary('', '# ') }}StartAlerters={{ zabbix_server_startalerters | default('') }}
@@ -67,6 +70,9 @@
 {{ (zabbix_server_startdiscoverers is defined and zabbix_server_startdiscoverers is not none) | ternary('', '# ') }}StartDiscoverers={{ zabbix_server_startdiscoverers | default('') }}
 {{ (zabbix_server_startescalators is defined and zabbix_server_startescalators is not none) | ternary('', '# ') }}StartEscalators={{ zabbix_server_startescalators | default('') }}
 {{ (zabbix_server_starthistorypollers is defined and zabbix_server_starthistorypollers is not none) | ternary('', '# ') }}StartHistoryPollers={{ zabbix_server_starthistorypollers | default('') }}
+{% if zabbix_server_version is version('6.4', '>') %}
+{{ (zabbix_server_starthttpagentpollers is defined and zabbix_server_starthttpagentpollers is not none) | ternary('', '# ') }}StartHTTPAgentPollers={{ zabbix_server_starthttpagentpollers | default('') }}
+{% endif %}
 {{ (zabbix_server_starthttppollers is defined and zabbix_server_starthttppollers is not none) | ternary('', '# ') }}StartHTTPPollers={{ zabbix_server_starthttppollers | default('') }}
 {{ (zabbix_server_startipmipollers is defined and zabbix_server_startipmipollers is not none) | ternary('', '# ') }}StartIPMIPollers={{ zabbix_server_startipmipollers | default('') }}
 {{ (zabbix_server_startjavapollers is defined and zabbix_server_startjavapollers is not none) | ternary('', '# ') }}StartJavaPollers={{ zabbix_server_startjavapollers | default('') }}
@@ -78,6 +84,9 @@
 {{ (zabbix_server_startpreprocessors is defined and zabbix_server_startpreprocessors is not none) | ternary('', '# ') }}StartPreprocessors={{ zabbix_server_startpreprocessors | default('') }}
 {{ (zabbix_server_startproxypollers is defined and zabbix_server_startproxypollers is not none) | ternary('', '# ') }}StartProxyPollers={{ zabbix_server_startproxypollers | default('') }}
 {{ (zabbix_server_startreportwriters is defined and zabbix_server_startreportwriters is not none) | ternary('', '# ') }}StartReportWriters={{ zabbix_server_startreportwriters | default('') }}
+{% if zabbix_server_version is version('6.4', '>') %}
+{{ (zabbix_server_startsnmpagentpollers is defined and zabbix_server_startsnmpagentpollers is not none) | ternary('', '# ') }}StartSNMMPAgentPollers={{ zabbix_server_startsnmpagentpollers | default('') }}
+{% endif %}
 {{ (zabbix_server_startsnmptrapper is defined and zabbix_server_startsnmptrapper is not none) | ternary('', '# ') }}StartSNMPTrapper={{ zabbix_server_startsnmptrapper | default('') }}
 {{ (zabbix_server_starttimers is defined and zabbix_server_starttimers is not none) | ternary('', '# ') }}StartTimers={{ zabbix_server_starttimers | default('') }}
 {{ (zabbix_server_starttrappers is defined and zabbix_server_starttrappers is not none) | ternary('', '# ') }}StartTrappers={{ zabbix_server_starttrappers | default('') }}
diff --git a/roles/zabbix_server/vars/Debian.yml b/roles/zabbix_server/vars/Debian.yml
index a1e804cc5..f84bf683d 100644
--- a/roles/zabbix_server/vars/Debian.yml
+++ b/roles/zabbix_server/vars/Debian.yml
@@ -8,15 +8,19 @@ mysql_create_dir: ""
 zabbix_valid_server_versions:
   # Debian
   "12":
+    - 6.5
     - 6.0
   "11":
+    - 6.5
     - 6.0
   "10":
     - 6.0
   # Ubuntu
   "22":
+    - 6.5
     - 6.0
   "20":
+    - 6.5
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
diff --git a/roles/zabbix_server/vars/RedHat.yml b/roles/zabbix_server/vars/RedHat.yml
index ef46ac2e6..b1bcef73d 100644
--- a/roles/zabbix_server/vars/RedHat.yml
+++ b/roles/zabbix_server/vars/RedHat.yml
@@ -10,8 +10,10 @@ __epel_repo:
 
 zabbix_valid_server_versions:
   "9":
+    - 6.5
     - 6.0
   "8":
+    - 6.5
     - 6.0
 
 pgsql_depenencies:
diff --git a/roles/zabbix_web/tasks/RedHat.yml b/roles/zabbix_web/tasks/RedHat.yml
index 30871017e..33df66949 100644
--- a/roles/zabbix_web/tasks/RedHat.yml
+++ b/roles/zabbix_web/tasks/RedHat.yml
@@ -23,6 +23,12 @@
   tags:
     - install
 
+- name: TEMP Update Version Number
+  ansible.builtin.set_fact:
+    zabbix_web_version: 7.0
+    zabbix_server_version: 7.0
+  when: zabbix_web_version == 6.5
+
 - name: "RedHat | Install zabbix-web-{{ zabbix_server_database }}"
   ansible.builtin.yum:
     name:
diff --git a/roles/zabbix_web/vars/Debian.yml b/roles/zabbix_web/vars/Debian.yml
index f47d74562..7ddb4c674 100644
--- a/roles/zabbix_web/vars/Debian.yml
+++ b/roles/zabbix_web/vars/Debian.yml
@@ -26,15 +26,19 @@ _nginx_tls_dhparam: /etc/ssl/private/dhparams.pem
 zabbix_valid_web_versions:
   # Debian
   "12":
+    - 6.5
     - 6.0
   "11":
+    - 6.5
     - 6.0
   "10":
     - 6.0
   # Ubuntu
   "22":
+    - 6.5
     - 6.0
   "20":
+    - 6.5
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
diff --git a/roles/zabbix_web/vars/RedHat.yml b/roles/zabbix_web/vars/RedHat.yml
index 785c18c99..91eed67a1 100644
--- a/roles/zabbix_web/vars/RedHat.yml
+++ b/roles/zabbix_web/vars/RedHat.yml
@@ -20,12 +20,10 @@ __epel_repo:
 
 zabbix_valid_web_versions:
   "9":
-    - 6.4
-    - 6.2
+    - 6.5
     - 6.0
   "8":
-    - 6.4
-    - 6.2
+    - 6.5
     - 6.0
 
 zabbix_web_php_dependencies: