diff --git a/rootfs/standard/etc/systemd/system/netdata.service b/rootfs/standard/etc/systemd/system/netdata.service
index 2bfb3c9e..80d257ad 100644
--- a/rootfs/standard/etc/systemd/system/netdata.service
+++ b/rootfs/standard/etc/systemd/system/netdata.service
@@ -7,7 +7,7 @@ Wants=mynode.service docker_images.service
 After=mynode.service docker_images.service
 
 [Service]
-WorkingDirectory=/opt/mynode/docker
+WorkingDirectory=/opt/mynode/netdata
 ExecStart=/usr/local/bin/docker-compose -f netdata-compose.yml up
 ExecStop=/usr/local/bin/docker-compose -f netdata-compose.yml down
 
diff --git a/rootfs/standard/opt/mynode/docker/netdata-compose.yml b/rootfs/standard/opt/mynode/netdata/netdata-compose.yml
similarity index 92%
rename from rootfs/standard/opt/mynode/docker/netdata-compose.yml
rename to rootfs/standard/opt/mynode/netdata/netdata-compose.yml
index b80b281a..6d650960 100644
--- a/rootfs/standard/opt/mynode/docker/netdata-compose.yml
+++ b/rootfs/standard/opt/mynode/netdata/netdata-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   netdata:
-    image: netdata/netdata
+    image: netdata/netdata:v1.19.0
     hostname: mynode.local # set to fqdn of host
     ports:
       - 19999:19999
diff --git a/rootfs/standard/usr/bin/mynode_docker_images.sh b/rootfs/standard/usr/bin/mynode_docker_images.sh
index 4909eda3..f86629c1 100755
--- a/rootfs/standard/usr/bin/mynode_docker_images.sh
+++ b/rootfs/standard/usr/bin/mynode_docker_images.sh
@@ -19,7 +19,7 @@ while true; do
     touch /tmp/installing_docker_images
 
     # Pull images that don't need to be built
-    docker pull netdata/netdata
+    # ???
 
     # Upgrade WebSSH2
     echo "Checking for new webssh2..."
diff --git a/rootfs/standard/usr/bin/mynode_reinstall_app.sh b/rootfs/standard/usr/bin/mynode_reinstall_app.sh
index a6208347..a3d9cc74 100755
--- a/rootfs/standard/usr/bin/mynode_reinstall_app.sh
+++ b/rootfs/standard/usr/bin/mynode_reinstall_app.sh
@@ -30,6 +30,9 @@ elif [ "$APP" = "lndconnect" ]; then
     rm -f  /home/bitcoin/.mynode/.lndconnect_url
 elif [ "$APP" = "lndhub" ]; then
     rm -f /home/bitcoin/.mynode/.lndhub_url
+elif [ "$APP" = "netdata" ]; then
+    systemctl stop netdata
+    docker rmi netdata/netdata || true
 elif [ "$APP" = "mempoolspace" ]; then
     rm -f /mnt/hdd/mynode/settings/mempoolspace_url
     systemctl stop mempoolspace
diff --git a/rootfs/standard/var/www/mynode/templates/settings.html b/rootfs/standard/var/www/mynode/templates/settings.html
index 5602ac22..684c96bb 100644
--- a/rootfs/standard/var/www/mynode/templates/settings.html
+++ b/rootfs/standard/var/www/mynode/templates/settings.html
@@ -923,7 +923,8 @@
                 <option value="joinmarket">JoinMarket</option>
                 <option value="lndconnect">LND Connect</option>				
                 <option value="lndhub">LNDHub</option>
-                <option value="mempoolspace">Mempool.Space</option>				
+                <option value="mempoolspace">Mempool</option>	
+                <option value="netdata">Netdata</option>				
                 <option value="rtl">RTL</option>
                 <option value="tor">Tor</option>
                 <option value="ufw">UFW</option>