From f704fcc6a8e7656adadf648376aef84fec87d513 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Tue, 23 Dec 2025 12:31:52 +0200
Subject: [PATCH 1/3] Separate push-lts-docker-amd-arm-images profile

---
 msa/pom.xml | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/msa/pom.xml b/msa/pom.xml
index 5eff7cc06d..66e92678ce 100644
--- a/msa/pom.xml
+++ b/msa/pom.xml
@@ -126,10 +126,10 @@
             </build>
         </profile>
         <profile>
-            <id>lts</id>
+            <id>push-lts-docker-amd-arm-images</id>
             <activation>
                 <property>
-                    <name>lts</name>
+                    <name>push-lts-docker-amd-arm-images</name>
                 </property>
             </activation>
             <properties>
@@ -141,6 +141,27 @@
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
                         <executions>
+                            <execution>
+                                <id>push-version-docker-amd-arm-images</id>
+                                <phase>${docker.push-arm-amd-image.phase}</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <workingDirectory>${project.build.directory}</workingDirectory>
+                                    <arguments>
+                                        <argument>buildx</argument>
+                                        <argument>build</argument>
+                                        <argument>-t</argument>
+                                        <argument>${docker.repo}/${docker.name}:${project.version}</argument>
+                                        <argument>--platform=linux/amd64,linux/arm64</argument>
+                                        <argument>-o</argument>
+                                        <argument>type=registry</argument>
+                                        <argument>.</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
                             <execution>
                                 <id>push-lts-docker-amd-arm-images</id>
                                 <phase>${docker.push-arm-amd-image.phase}</phase>

From 1ff694f0fd0f233012ac3e2093835c59f4d74230 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Tue, 23 Dec 2025 15:21:41 +0200
Subject: [PATCH 2/3] Revert to Java 17 due to fonts issue

---
 msa/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msa/pom.xml b/msa/pom.xml
index 66e92678ce..a210c45eef 100644
--- a/msa/pom.xml
+++ b/msa/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <main.dir>${basedir}/..</main.dir>
         <docker.repo>thingsboard</docker.repo>
-        <docker.base.image>thingsboard/openjdk25:trixie-slim</docker.base.image>
+        <docker.base.image>thingsboard/openjdk17:bookworm-slim</docker.base.image>
         <dockerfile.skip>true</dockerfile.skip>
         <blackBoxTests.skip>true</blackBoxTests.skip>
         <dockerfile-maven.version>1.4.13</dockerfile-maven.version>

From cff9286290c507e8f2e953f85b11ffaecdc5ae0f Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Tue, 23 Dec 2025 15:49:02 +0200
Subject: [PATCH 3/3] Add optional latest tag push for LTS

---
 msa/pom.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/msa/pom.xml b/msa/pom.xml
index 66e92678ce..6af7521df6 100644
--- a/msa/pom.xml
+++ b/msa/pom.xml
@@ -134,6 +134,7 @@
             </activation>
             <properties>
                 <docker.lts.tag>4.2.1-latest</docker.lts.tag>
+                <docker.skip.latest.tag>false</docker.skip.latest.tag>
             </properties>
             <build>
                 <plugins>
@@ -141,6 +142,28 @@
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
                         <executions>
+                            <execution>
+                                <id>push-latest-docker-amd-arm-images</id>
+                                <phase>${docker.push-arm-amd-image.phase}</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <skip>${docker.skip.latest.tag}</skip>
+                                    <executable>docker</executable>
+                                    <workingDirectory>${project.build.directory}</workingDirectory>
+                                    <arguments>
+                                        <argument>buildx</argument>
+                                        <argument>build</argument>
+                                        <argument>-t</argument>
+                                        <argument>${docker.repo}/${docker.name}:latest</argument>
+                                        <argument>--platform=linux/amd64,linux/arm64</argument>
+                                        <argument>-o</argument>
+                                        <argument>type=registry</argument>
+                                        <argument>.</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
                             <execution>
                                 <id>push-version-docker-amd-arm-images</id>
                                 <phase>${docker.push-arm-amd-image.phase}</phase>