diff --git a/Dockerfile b/Dockerfile
index 7f9aaec..3ba0079 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -79,8 +79,11 @@ RUN apk --update --no-cache add \
   && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
   && apk del build-dependencies \
   && rm -rf /var/cache/apk/* /var/www/* /tmp/* \
+  && echo "/usr/sbin/fping -6 \$@" > /usr/sbin/fping6 \
+  && chmod +x /usr/sbin/fping6 \
   && setcap cap_net_raw+ep /usr/bin/nmap \
-  && setcap cap_net_raw+ep /usr/sbin/fping
+  && setcap cap_net_raw+ep /usr/sbin/fping \
+  && setcap cap_net_raw+ep /usr/sbin/fping6
 
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS="2" \
   LIBRENMS_VERSION="1.69" \
diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml
index 1211b80..d117070 100644
--- a/examples/compose/docker-compose.yml
+++ b/examples/compose/docker-compose.yml
@@ -45,6 +45,9 @@ services:
     image: librenms/librenms:latest
     container_name: librenms
     hostname: librenms
+    cap_add:
+      - NET_ADMIN
+      - NET_RAW
     ports:
       - target: 8000
         published: 8000
@@ -72,6 +75,9 @@ services:
     image: librenms/librenms:latest
     container_name: librenms_dispatcher
     hostname: librenms-dispatcher
+    cap_add:
+      - NET_ADMIN
+      - NET_RAW
     depends_on:
       - librenms
       - redis
@@ -99,6 +105,9 @@ services:
     image: librenms/librenms:latest
     container_name: librenms_syslogng
     hostname: librenms-syslogng
+    cap_add:
+      - NET_ADMIN
+      - NET_RAW
     depends_on:
       - librenms
     ports:
diff --git a/examples/pwd/librenms.yml b/examples/pwd/librenms.yml
index d229ace..937ae05 100644
--- a/examples/pwd/librenms.yml
+++ b/examples/pwd/librenms.yml
@@ -55,6 +55,9 @@ services:
   librenms:
     image: librenms/librenms:edge
     hostname: librenms
+    cap_add:
+      - NET_ADMIN
+      - NET_RAW
     ports:
       - "8000:8000"
     depends_on:
@@ -77,6 +80,9 @@ services:
   dispatcher:
     image: librenms/librenms:edge
     hostname: librenms-dispatcher-1234
+    cap_add:
+      - NET_ADMIN
+      - NET_RAW
     depends_on:
       - librenms
       - redis
@@ -102,6 +108,9 @@ services:
   dispatcher2:
     image: librenms/librenms:edge
     hostname: librenms-dispatcher-5678
+    cap_add:
+      - NET_ADMIN
+      - NET_RAW
     depends_on:
       - librenms
       - redis
@@ -127,6 +136,9 @@ services:
   syslogng:
     image: librenms/librenms:edge
     hostname: librenms-syslogng
+    cap_add:
+      - NET_ADMIN
+      - NET_RAW
     depends_on:
       - librenms
     volumes:
diff --git a/examples/rrdcached-server/docker-compose.yml b/examples/rrdcached-server/docker-compose.yml
index 2d63ab2..d817f34 100644
--- a/examples/rrdcached-server/docker-compose.yml
+++ b/examples/rrdcached-server/docker-compose.yml
@@ -62,6 +62,9 @@ services:
     image: librenms/librenms:latest
     container_name: librenms
     hostname: librenms
+    cap_add:
+      - NET_ADMIN
+      - NET_RAW
     ports:
       - target: 8000
         published: 8000
@@ -90,6 +93,9 @@ services:
     image: librenms/librenms:latest
     container_name: librenms_dispatcher
     hostname: librenms-dispatcher
+    cap_add:
+      - NET_ADMIN
+      - NET_RAW
     depends_on:
       - librenms
       - redis
@@ -117,6 +123,9 @@ services:
     image: librenms/librenms:latest
     container_name: librenms_syslogng
     hostname: librenms-syslogng
+    cap_add:
+      - NET_ADMIN
+      - NET_RAW
     depends_on:
       - librenms
     ports:
diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh
index 90378b3..ef2bbc2 100644
--- a/rootfs/etc/cont-init.d/03-config.sh
+++ b/rootfs/etc/cont-init.d/03-config.sh
@@ -134,8 +134,6 @@ cat > ${LIBRENMS_PATH}/config.d/user.php <<EOL
 EOL
 
 # Config : Fping
-echo "/usr/sbin/fping -6 \$@" > /usr/sbin/fping6
-chmod +x /usr/sbin/fping6
 cat > ${LIBRENMS_PATH}/config.d/fping.php <<EOL
 <?php
 \$config['fping'] = "/usr/sbin/fping";