diff --git a/.github/workflows/CI_github.yml b/.github/workflows/CI_github.yml
index d93a59331..b8844bb5c 100644
--- a/.github/workflows/CI_github.yml
+++ b/.github/workflows/CI_github.yml
@@ -573,3 +573,22 @@ jobs:
       with:
         name: firmware
         path: ./build_output/firmware
+
+  tasmota-VN:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python
+      uses: actions/setup-python@v1
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U platformio
+        platformio upgrade --dev
+        platformio update
+    - name: Run PlatformIO
+      run: platformio run -e tasmota-VN
+    - uses: actions/upload-artifact@v2
+      with:
+        name: firmware
+        path: ./build_output/firmware
diff --git a/.github/workflows/CI_github_ESP32.yml b/.github/workflows/CI_github_ESP32.yml
index 519604bde..aca4ddb15 100644
--- a/.github/workflows/CI_github_ESP32.yml
+++ b/.github/workflows/CI_github_ESP32.yml
@@ -603,3 +603,23 @@ jobs:
       with:
         name: firmware
         path: ./build_output/firmware
+
+  tasmota32-VN:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python
+      uses: actions/setup-python@v1
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U platformio
+        platformio upgrade --dev
+        platformio update
+    - name: Run PlatformIO
+      run: |
+        platformio run -e tasmota32-VN
+    - uses: actions/upload-artifact@v2
+      with:
+        name: firmware
+        path: ./build_output/firmware
diff --git a/.github/workflows/Tasmota_build.yml b/.github/workflows/Tasmota_build.yml
index ee4bd9b21..bbcd57260 100644
--- a/.github/workflows/Tasmota_build.yml
+++ b/.github/workflows/Tasmota_build.yml
@@ -1449,8 +1449,31 @@ jobs:
         path: ./build_output/firmware
 
 
+  tasmota32-VN:
+    needs: tasmota_pull
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python
+      uses: actions/setup-python@v1
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U platformio
+        platformio upgrade --dev
+        platformio update
+    - name: Run PlatformIO
+      run: |
+        platformio run -e tasmota32-VN
+    - uses: actions/upload-artifact@v2
+      with:
+        name: firmware
+        path: ./build_output/firmware
+
+
   Upload:
-    needs: [tasmota-UK, tasmota32-ircustom, tasmota32-UK, tasmota32-TW, tasmota32-TR]    
+    needs: [tasmota-VN, tasmota32-ircustom, tasmota32-VN, tasmota32-TW, tasmota32-TR]    
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
diff --git a/.travis.yml.off b/.travis.yml.off
index 5e5885f65..02f97e5b5 100644
--- a/.travis.yml.off
+++ b/.travis.yml.off
@@ -39,6 +39,7 @@ env:
   - ENV=tasmota-TR
   - ENV=tasmota-TW
   - ENV=tasmota-UK
+  - ENV=tasmota-VN
 
 script:
   - platformio run -e $ENV
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75fd26a73..2a1c51bd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased] - Development
 
 ## [9.0.0.2]
+### Added
+- Support for Vietnamese language translations by Tâm.NT
+
 ### Changed
 - Command ``Gpio17`` replaces command ``Adc``
 - Command ``Gpios`` replaces command ``Adcs``
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5f0a86a04..3702663d9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -67,6 +67,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
 - Support for stateful ACs using ``StateMode`` in tasmota-ir.bin by Arik Yavilevich (#9472)
 - Zigbee ``ZbData`` command for better support of device specific data
 - Support for analog buttons indexed within standard button range
+- Support for Vietnamese language translations by Tâm.NT
 
 ### Changed
 - Redesigned ESP8266 GPIO internal representation in line with ESP32 changing ``Template`` layout too
diff --git a/platformio.ini b/platformio.ini
index f8b478b1f..8785cb634 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -43,6 +43,7 @@ default_envs =
 ;                tasmota-TR
 ;                tasmota-TW
 ;                tasmota-UK
+;                tasmota-VN
 ;
 ; *** Selection for Tasmota ESP32 is done in platformio_tasmota32.ini
 ;
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index bdd07be81..2eb453954 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -37,6 +37,7 @@ default_envs =  ${build_envs.default_envs}
 ;                tasmota32-TR
 ;                tasmota32-TW
 ;                tasmota32-UK
+;                tasmota32-VN
 
 
 [core32]
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index d0e28b990..41944ed37 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -106,3 +106,6 @@ build_flags = ${common.build_flags} -DMY_LANGUAGE=zh_TW
 
 [env:tasmota-UK]
 build_flags = ${common.build_flags} -DMY_LANGUAGE=uk_UA
+
+[env:tasmota-VN]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=vi_VN
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 6d6a0ebc0..2e8b98fbb 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -139,3 +139,7 @@ build_flags             = ${common32.build_flags} -DMY_LANGUAGE=zh_TW
 [env:tasmota32-UK]
 extends = env:tasmota32
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=uk_UA
+
+[env:tasmota32-VN]
+extends = env:tasmota32
+build_flags             = ${common32.build_flags} -DMY_LANGUAGE=vi_VN