diff --git a/bin/ncp/BACKUPS/nc-rsync.sh b/bin/ncp/BACKUPS/nc-rsync.sh
index f92de08e..b10e297a 100644
--- a/bin/ncp/BACKUPS/nc-rsync.sh
+++ b/bin/ncp/BACKUPS/nc-rsync.sh
@@ -8,8 +8,6 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
-BASEDIR=/var/www
-
 install()
 {
   apt-get update
diff --git a/build/Vagrantfile b/build/Vagrantfile
index 3573bbc7..7c5669a3 100644
--- a/build/Vagrantfile
+++ b/build/Vagrantfile
@@ -20,6 +20,8 @@ Vagrant.configure("2") do |config|
   config.vm.define "ncp-vm"
   config.vm.provider :libvirt do |libvirt|
     libvirt.default_prefix = ""
+    libvirt.cpus = 4
+    libvirt.memory = 1024
   end
 
   config.vm.synced_folder '.', '/vagrant', disabled: true
diff --git a/build/docker/docker-compose-ncpdev.yml b/build/docker/docker-compose-ncpdev.yml
index 4c941b2c..80b06544 100644
--- a/build/docker/docker-compose-ncpdev.yml
+++ b/build/docker/docker-compose-ncpdev.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   nextcloudpi-dev:
-    image: ownyourbits/nextcloudpi
+    image: ownyourbits/nextcloudpi-x86
     command: "${IP}"
     ports:
      - "80:80"
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index e1c94452..122172d8 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   nextcloudpi:
-    image: ownyourbits/nextcloudpi
+    image: ownyourbits/nextcloudpi-x86
     command: "${IP}"
     ports:
      - "80:80"
diff --git a/etc/ncp-config.d/metrics.cfg b/etc/ncp-config.d/metrics.cfg
index 07e60ab2..a556e3fd 100644
--- a/etc/ncp-config.d/metrics.cfg
+++ b/etc/ncp-config.d/metrics.cfg
@@ -2,7 +2,7 @@
   "id": "metrics",
   "name": "System Metrics, that can be collected by an external server",
   "title": "System Metrics",
-  "description": "Prometheus (https://prometheus.io) compatible metrics for things like, CPU/memory/disk usage etc.",
+  "description": "Prometheus metrics for things like, CPU/memory/disk usage etc.",
   "info": "In order to use these metrics, you will need to setup at least an external Prometheus instance. You can find a quick and easy way to start at https://github.com/theCalcaholic/ncp-monitoring-dashboard",
   "infotitle": "External service required",
   "params": [