diff --git a/cloudcommander/CHANGELOG.md b/cloudcommander/CHANGELOG.md
index 40a5c70f9..2c80cd6e6 100644
--- a/cloudcommander/CHANGELOG.md
+++ b/cloudcommander/CHANGELOG.md
@@ -1,14 +1,19 @@
+- Switch to alpine
 
 ## 16.17.5 (09-09-2023)
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 16.16.3 (12-08-2023)
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 16.16.0 (15-07-2023)
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 16.15.0 (19-05-2023)
+
 - Update to latest version from coderaiser/cloudcmd
 - Feat : cifsdomain added
 
diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile
index 8cce58bbc..65600ffff 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -15,8 +15,8 @@
 #################
 
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="latest"
-FROM coderaiser/cloudcmd:${BUILD_UPSTREAM}
+ARG BUILD_FROM
+FROM ${BUILD_FROM}
 
 ##################
 # 2 Modify Image #
diff --git a/cloudcommander/build.json b/cloudcommander/build.json
new file mode 100644
index 000000000..8daf18eba
--- /dev/null
+++ b/cloudcommander/build.json
@@ -0,0 +1,10 @@
+{
+  "build_from": {
+    "aarch64": "coderaiser/cloudcmd:latest-alpine",
+    "amd64": "coderaiser/cloudcmd:latest-alpine",
+    "armv7": "coderaiser/cloudcmd:latest-alpine"
+  },
+  "codenotary": {
+    "signer": "alexandrep.github@gmail.com"
+  }
+}
\ No newline at end of file
diff --git a/cloudcommander/config.json b/cloudcommander/config.json
index f20fca730..cc1ad9f47 100644
--- a/cloudcommander/config.json
+++ b/cloudcommander/config.json
@@ -91,4 +91,4 @@
   "slug": "cloudcommander",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/cloudcommander",
   "version": "16.17.5"
-}
+}
\ No newline at end of file