diff --git a/.drone.yml b/.drone.yml
index 12e0436..769db2c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,7 +3,6 @@ type: docker
 name: docmaster
 
 steps:
-
   - name: build_and_publish_docmaster
     image: plugins/docker:linux-amd64
     settings:
@@ -25,13 +24,11 @@ trigger:
     - push
 
 ---
-
 kind: pipeline
 type: docker
 name: ot-recorder
 
 steps:
-
   - name: build_and_publish_ot-recorder
     image: plugins/docker:linux-amd64
     settings:
@@ -53,13 +50,37 @@ trigger:
     - push
 
 ---
+kind: pipeline
+type: docker
+name: upsmon
 
+steps:
+  - name: build_and_publish_upsmon
+    image: plugins/docker:linux-amd64
+    settings:
+      dockerfile: upsmon/Dockerfile
+      context: upsmon
+      password:
+        from_secret: docker_password
+      registry: docker.asperti.com
+      repo: docker.asperti.com/paspo/hassio-upsmon
+      tags:
+        - latest
+        - 0.2.0
+      username:
+        from_secret: docker_username
+
+trigger:
+  event:
+    - tag
+    - push
+
+---
 kind: pipeline
 type: docker
 name: zabbix-agent
 
 steps:
-
   - name: build_and_publish_zabbix-agent
     image: plugins/docker:linux-amd64
     settings:
@@ -80,15 +101,12 @@ trigger:
     - tag
     - push
 
-
 ---
-
 kind: pipeline
 type: docker
 name: zabbix-agent2
 
 steps:
-
   - name: build_and_publish_zabbix-agent2
     image: plugins/docker:linux-amd64
     settings:
diff --git a/upsmon/Dockerfile b/upsmon/Dockerfile
index f20674f..0954a94 100644
--- a/upsmon/Dockerfile
+++ b/upsmon/Dockerfile
@@ -1,11 +1,9 @@
-ARG BUILD_FROM
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:10.0.2
 FROM $BUILD_FROM
 
 ENV LANG C.UTF-8
 
-# Copy scripts for add-on
-COPY run.sh /
-COPY shutdown.sh /
+COPY run.sh shutdown.sh /
 
 RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \
     echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
@@ -14,7 +12,6 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositori
     mkdir /var/run/nut  && \
     chown root:nut /var/run/nut && \
     chmod 770 /var/run/nut && \
-    chmod a+x /run.sh && \
-    chmod a+x /shutdown.sh
+    chmod a+x /run.sh /shutdown.sh
 
 CMD [ "/run.sh" ]
diff --git a/upsmon/config.json b/upsmon/config.json
index 6b23da5..ad465c8 100644
--- a/upsmon/config.json
+++ b/upsmon/config.json
@@ -1,7 +1,7 @@
 {
   "name": "Network UPS Tools - netclient",
   "url": "https://git.asperti.com/paspo/hassio-addons",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "slug": "upsmon",
   "description": "Connect to a remote NUT server",
   "startup": "services",