diff --git a/group_vars/proxmox.yml b/group_vars/proxmox.yml
index 371f932f..f697b4f5 100644
--- a/group_vars/proxmox.yml
+++ b/group_vars/proxmox.yml
@@ -9,8 +9,6 @@
   smart_smartctlmail_cron_weekday: "3"
   ### mgrote.zfs_extra # Variablen für mgrote.zfs_health/trim/scrub/zed/arc_mem/ sind zusammengefasst unter zfs_extra_*
   zfs_extra_max_usage_health: "80"
-  ### mgrote.apcupsd
-  apcupsd_slave_polltime: 10 #in Sekunden
   ### geerlingguy.munin-node
   munin_node_additional_plugins:
     - name: chrony
@@ -54,21 +52,6 @@
     - name: apc_nis
     - name: lvm_
 
-  ### mgrote.apcupsd
-  apcupsd_master_onbatterydelay: 10
-  apcupsd_master_batterylevel_for_shutdown: 50
-  apcupsd_master_minutes_for_shutdown: 10
-  apcupsd_master_nologon_when_active: disable
-  apcupsd_slave_onbatterydelay: 10
-  apcupsd_slave_batterylevel_for_shutdown: 50
-  apcupsd_slave_minutes_for_shutdown: 10
-  apcupsd_slave_nologon_when_active: disable
-  apcupsd_nis_master: on
-  apcupsd_nis_master_listen_ip: 0.0.0.0
-  apcupsd_nis_master_listen_port: 3551
-  apcupsd_ups_name: APC-BX950U-GR
-
-
   # Ansible Variablen
   ### sudo
   sudo: false
diff --git a/host_vars/pve2-test.grote.lan.yml b/host_vars/pve2-test.grote.lan.yml
index 742be899..7464a458 100644
--- a/host_vars/pve2-test.grote.lan.yml
+++ b/host_vars/pve2-test.grote.lan.yml
@@ -42,10 +42,6 @@
       atime: on
       snapdir: hidden
 
-  ### mgrote.apcupsd
-  apcupsd_nis_master: true
-  apcupsd_nis_master_hostname: pve2-test.grote.lan
-
   ### mgrote.zfs_extra # Variablen für mgrote.zfs_health/trim/scrub/zed/arc_mem/ sind zusammengefasst unter zfs_extra_*
   zfs_extra_arc_max_size: "2147483648" # 2GB in Bytes
   zfs_extra_zfs_pools:
diff --git a/host_vars/pve2.grote.lan.yml b/host_vars/pve2.grote.lan.yml
index a42191c2..bed46548 100644
--- a/host_vars/pve2.grote.lan.yml
+++ b/host_vars/pve2.grote.lan.yml
@@ -153,9 +153,6 @@
       atime: on
       snapdir: hidden
 
-  ### mgrote.apcupsd
-  apcupsd_nis_master: true
-  apcupsd_nis_master_hostname: pve2.grote.lan
   ### mgrote.zfs_extra # Variablen für mgrote.zfs_health/trim/scrub/zed/arc_mem/ sind zusammengefasst unter zfs_extra_*
   zfs_extra_arc_max_size: "8589934592" # 8GB in Bytes
   zfs_extra_max_usage_health: "90"
@@ -248,14 +245,6 @@
   cv4pve_dl_link: "https://github.com/Corsinvest/cv4pve-autosnap/releases/download/v1.10.0/cv4pve-autosnap-linux-x64.zip"
 
   ### geerlingguy.munin-node
-  munin_node_plugins:
-    - name: apc_nis
-  munin_node_config: {
-  "apc_nis": {
-    "env.host": "pve2.grote.lan",
-    "env.port": "3551"
-    }
-  }
   munin_node_additional_plugins:
     - name: chrony
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/chrony
@@ -275,9 +264,6 @@
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/kvm_mem
     - name: kvm_net
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/kvm_net
-    - name: apcupsd_pwr
-      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/apcupsd_pwr
-    - name: apc_nis # ist lokal vorhanden
   munin_node_disabled_plugins:
     - name: meminfo # zu hohe last
     - name: hddtemp2 # ersetzt durch hddtemp_smartctl
@@ -295,6 +281,7 @@
     - name: fail2ban
     - name: fail2ban_
     - name: apcupsd_pct
+    - name: apc_nis
     - name: kvm_io
     - name: kvm_cpu
     - name: docker_mem