diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml
new file mode 100644
index 00000000..49a417bf
--- /dev/null
+++ b/.github/workflows/build-docker-image.yaml
@@ -0,0 +1,59 @@
+name: Build Docker Image
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to build from'
+        required: true
+        type: choice
+        default: 'master'
+        options:
+          - 'master'
+          - 'development'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.inputs.branch }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Load Buildx
+        run: docker buildx create --name mybuilder --use
+        if: runner.os == 'Linux'
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: Extract version from package.json
+        if: ${{ github.event.inputs.branch == 'master' }}
+        run: echo "DOCKER_TAG=$(jq -r '.version' package.json)" >> $GITHUB_ENV
+
+      - name: Build and push production Docker image
+        if: ${{ github.event.inputs.branch == 'master' }}
+        run: |
+          docker buildx build \
+            --platform linux/amd64,linux/arm64,linux/arm/v7 \
+            -t benzino77/tasmocompiler:$DOCKER_TAG \
+            -t benzino77/tasmocompiler:latest \
+            -f Dockerfile --push .
+
+      - name: Build and push development Docker image
+        if: ${{ github.event.inputs.branch == 'development' }}
+        run: |
+          docker buildx build \
+            --platform linux/amd64,linux/arm64,linux/arm/v7 \
+            -t benzino77/tasmocompiler:development \
+            -f Dockerfile --push .
diff --git a/src/components/AppStepper/FeaturesStep/AvailableFeatures.js b/src/components/AppStepper/FeaturesStep/AvailableFeatures.js
index 5acd9348..82d3be2e 100644
--- a/src/components/AppStepper/FeaturesStep/AvailableFeatures.js
+++ b/src/components/AppStepper/FeaturesStep/AvailableFeatures.js
@@ -402,7 +402,7 @@ const availableFeatures = [
       lib_extra_dirs: ['lib/libesp32', 'lib/libesp32_div', 'lib/lib_basic', 'lib/lib_i2c', 'lib/lib_ssl'],
     },
     custom: '',
-    boards: ['esp32generic', 'esp32webcam', 'esp32odroid-go', 'esp32m5', 'esp32solo1', 'esp32c3'],
+    boards: ['esp32generic', 'esp32webcam', 'esp32odroid-go', 'esp32m5', 'esp32solo1', 'esp32c3', 'esp32s3'],
   },
   {
     name: 'USE_ETHERNET',
@@ -427,6 +427,7 @@ const availableFeatures = [
       '//!!! Please read https://tasmota.github.io/docs/Blinds-and-Shutters/#specific-configuration to understand what this option is for !!!\n' +
       '\n' +
       '//#define SHUTTER_CLEAR_PWM_ONSTOP\n',
+    include: ['USE_ENERGY_SENSOR'],
     boards: ['all'],
   },
   {