diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml
index 3f305d2f0..b767e44df 100644
--- a/docker-compose_v3_alpine_mysql_latest.yaml
+++ b/docker-compose_v3_alpine_mysql_latest.yaml
@@ -380,7 +380,7 @@ services:
    com.zabbix.description: "Zabbix snmptraps"
    com.zabbix.company: "Zabbix LLC"
    com.zabbix.component: "snmptraps"
-   com.zabbix.os: "ubuntu"
+   com.zabbix.os: "alpine"
 
  mysql-server:
   image: mysql:8.0
diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml
index ee047e71c..d0e876322 100644
--- a/docker-compose_v3_alpine_mysql_local.yaml
+++ b/docker-compose_v3_alpine_mysql_local.yaml
@@ -412,7 +412,7 @@ services:
    com.zabbix.description: "Zabbix snmptraps"
    com.zabbix.company: "Zabbix LLC"
    com.zabbix.component: "snmptraps"
-   com.zabbix.os: "ubuntu"
+   com.zabbix.os: "alpine"
 
  mysql-server:
   image: mysql:8.0
diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml
index c56bb3ebd..96be3a2c3 100644
--- a/docker-compose_v3_alpine_pgsql_latest.yaml
+++ b/docker-compose_v3_alpine_pgsql_latest.yaml
@@ -376,7 +376,7 @@ services:
    com.zabbix.description: "Zabbix snmptraps"
    com.zabbix.company: "Zabbix LLC"
    com.zabbix.component: "snmptraps"
-   com.zabbix.os: "ubuntu"
+   com.zabbix.os: "alpine"
 
  mysql-server:
   image: mysql:8.0
diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml
index 9d804a7d1..9ad5c448e 100644
--- a/docker-compose_v3_alpine_pgsql_local.yaml
+++ b/docker-compose_v3_alpine_pgsql_local.yaml
@@ -408,7 +408,7 @@ services:
    com.zabbix.description: "Zabbix snmptraps"
    com.zabbix.company: "Zabbix LLC"
    com.zabbix.component: "snmptraps"
-   com.zabbix.os: "ubuntu"
+   com.zabbix.os: "alpine"
 
  mysql-server:
   image: mysql:8.0
diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml
index 70d4909c8..2642475e6 100644
--- a/docker-compose_v3_centos_mysql_latest.yaml
+++ b/docker-compose_v3_centos_mysql_latest.yaml
@@ -380,7 +380,7 @@ services:
    com.zabbix.description: "Zabbix snmptraps"
    com.zabbix.company: "Zabbix LLC"
    com.zabbix.component: "snmptraps"
-   com.zabbix.os: "ubuntu"
+   com.zabbix.os: "centos"
 
  mysql-server:
   image: mysql:8.0
diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml
index 15b9f5fd4..9e68fa9a0 100644
--- a/docker-compose_v3_centos_mysql_local.yaml
+++ b/docker-compose_v3_centos_mysql_local.yaml
@@ -412,7 +412,7 @@ services:
    com.zabbix.description: "Zabbix snmptraps"
    com.zabbix.company: "Zabbix LLC"
    com.zabbix.component: "snmptraps"
-   com.zabbix.os: "ubuntu"
+   com.zabbix.os: "centos"
 
  mysql-server:
   image: mysql:8.0
diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml
index 2d81f5ca4..c648ae7b9 100644
--- a/docker-compose_v3_centos_pgsql_latest.yaml
+++ b/docker-compose_v3_centos_pgsql_latest.yaml
@@ -376,7 +376,7 @@ services:
    com.zabbix.description: "Zabbix snmptraps"
    com.zabbix.company: "Zabbix LLC"
    com.zabbix.component: "snmptraps"
-   com.zabbix.os: "ubuntu"
+   com.zabbix.os: "centos"
 
  mysql-server:
   image: mysql:8.0
diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml
index 368780ad2..bffa4b75c 100644
--- a/docker-compose_v3_centos_pgsql_local.yaml
+++ b/docker-compose_v3_centos_pgsql_local.yaml
@@ -408,7 +408,7 @@ services:
    com.zabbix.description: "Zabbix snmptraps"
    com.zabbix.company: "Zabbix LLC"
    com.zabbix.component: "snmptraps"
-   com.zabbix.os: "ubuntu"
+   com.zabbix.os: "centos"
 
  mysql-server:
   image: mysql:8.0
diff --git a/kubernetes.yaml b/kubernetes.yaml
index 046a45c64..a91cad95d 100644
--- a/kubernetes.yaml
+++ b/kubernetes.yaml
@@ -148,7 +148,7 @@ spec:
     spec:
       containers:
         - name: zabbix-web
-          image: zabbix/zabbix-web-nginx-mysql:alpine-3.4-latest
+          image: zabbix/zabbix-web-nginx-mysql:alpine-trunk
           imagePullPolicy: Always
           ports:
           - containerPort: 8080
@@ -282,7 +282,7 @@ spec:
     spec:
       containers:
         - name: zabbix-server
-          image: zabbix/zabbix-server-mysql:alpine-3.4-latest
+          image: zabbix/zabbix-server-mysql:alpine-trunk
           imagePullPolicy: Always
           ports:
           - containerPort: 10051
@@ -331,7 +331,7 @@ spec:
             mountPath: /var/lib/zabbix/snmptraps/
             readOnly: true
         - name: zabbix-snmptraps
-          image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
+          image: zabbix/zabbix-snmptraps:alpine-trunk
           imagePullPolicy: Always
           ports:
           - containerPort: 1162
@@ -364,7 +364,7 @@ spec:
     spec:
       containers:
         - name: zabbix-proxy-sqlite3
-          image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest
+          image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
           imagePullPolicy: Always
           ports:
           - containerPort: 10051
@@ -396,7 +396,7 @@ spec:
     spec:
       containers:
         - name: zabbix-proxy-mysql
-          image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest
+          image: zabbix/zabbix-proxy-mysql:alpine-trunk
           imagePullPolicy: Always
           ports:
           - containerPort: 10051
@@ -439,7 +439,7 @@ spec:
     spec:
       containers:
         - name: zabbix-java-gateway
-          image: zabbix/zabbix-java-gateway:alpine-3.4-latest
+          image: zabbix/zabbix-java-gateway:alpine-trunk
           imagePullPolicy: Always
           ports:
           - containerPort: 10052
@@ -449,7 +449,7 @@ spec:
           - name: ZBX_TIMEOUT
             value: "5"
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: zabbix-agent
@@ -470,7 +470,7 @@ spec:
     spec:
       containers:
         - name: zabbix-agent
-          image: zabbix/zabbix-agent:alpine-3.4-latest
+          image: zabbix/zabbix-agent:alpine-trunk
           imagePullPolicy: Always
           resources:
            limits: