diff --git a/community-containers/fail2ban/latest.json b/community-containers/fail2ban/latest.json
new file mode 100644
index 00000000000..08e4b53d75f
--- /dev/null
+++ b/community-containers/fail2ban/latest.json
@@ -0,0 +1,27 @@
+{
+    "aio_services_v1": [
+        {
+            "container_name": "nextcloud-aio-fail2ban",
+            "display_name": "Fail2ban",
+            "image": "szaimen/aio-fail2ban",
+            "image_tag": "latest",
+            "internal_port": "host",
+            "restart": "unless-stopped",
+            "cap_add": [
+                "NET_ADMIN",
+                "NET_RAW"
+            ],
+            "environment": [
+                "TZ=%TIMEZONE%"
+            ],
+            "apparmor_unconfined": true,
+            "volumes": [
+                {
+                    "source": "nextcloud_aio_backup_nextcloud",
+                    "destination": "/nextcloud",
+                    "writeable": false
+                }
+            ]
+        }
+    ]
+}
diff --git a/community-containers/fail2ban/readme.md b/community-containers/fail2ban/readme.md
new file mode 100644
index 00000000000..ef5ac7fdafa
--- /dev/null
+++ b/community-containers/fail2ban/readme.md
@@ -0,0 +1 @@
+This is not working on Docker Desktop since it needs network_mode: host in order to work correctly.
\ No newline at end of file
diff --git a/community-containers/lldap/beta.json b/community-containers/lldap/beta.json
new file mode 100644
index 00000000000..013a5297cd3
--- /dev/null
+++ b/community-containers/lldap/beta.json
@@ -0,0 +1,35 @@
+{
+    "aio_services_v1": [
+        {
+            "container_name": "nextcloud-aio-lldap",
+            "display_name": "LLDAP",
+            "image": "nitnelave/lldap",
+            "image_tag": "latest",
+            "ports": [
+                {
+                    "ip_binding": "127.0.0.1",
+                    "port_number": "17170",
+                    "protocol": "tcp"
+                }
+            ],
+            "internal_port": "3890",
+            "restart": "unless-stopped",
+            "environment": [
+                "TZ=%TIMEZONE%",
+                "LLDAP_JWT_SECRET=%LLDAP_JWT_SECRET%",
+                "LLDAP_LDAP_USER_PASS=%LLDAP_LDAP_USER_PASS%"
+            ],
+            "secrets": [
+               "LLDAP_JWT_SECRET",
+               "LLDAP_LDAP_USER_PASS"
+            ],
+            "volumes": [
+                {
+                    "source": "nextcloud_aio_backup_lldap_data",
+                    "destination": "/data",
+                    "writeable": true
+                }
+            ]
+        }
+    ]
+}
diff --git a/community-containers/lldap/latest.json b/community-containers/lldap/latest.json
new file mode 100644
index 00000000000..a6bafea35c3
--- /dev/null
+++ b/community-containers/lldap/latest.json
@@ -0,0 +1,35 @@
+{
+    "aio_services_v1": [
+        {
+            "container_name": "nextcloud-aio-lldap",
+            "display_name": "LLDAP",
+            "image": "nitnelave/lldap",
+            "image_tag": "stable",
+            "ports": [
+                {
+                    "ip_binding": "127.0.0.1",
+                    "port_number": "17170",
+                    "protocol": "tcp"
+                }
+            ],
+            "internal_port": "3890",
+            "restart": "unless-stopped",
+            "environment": [
+                "TZ=%TIMEZONE%",
+                "LLDAP_JWT_SECRET=%LLDAP_JWT_SECRET%",
+                "LLDAP_LDAP_USER_PASS=%LLDAP_LDAP_USER_PASS%"
+            ],
+            "secrets": [
+               "LLDAP_JWT_SECRET",
+               "LLDAP_LDAP_USER_PASS"
+            ],
+            "volumes": [
+                {
+                    "source": "nextcloud_aio_backup_lldap_data",
+                    "destination": "/data",
+                    "writeable": true
+                }
+            ]
+        }
+    ]
+}
diff --git a/community-containers/lldap/readme.md b/community-containers/lldap/readme.md
new file mode 100644
index 00000000000..33ad7c74526
--- /dev/null
+++ b/community-containers/lldap/readme.md
@@ -0,0 +1,4 @@
+TODO: 
+- find out if - LLDAP_LDAP_BASE_DN=dc=example,dc=com is really needed or can be configured via the interface.
+- Also think about publishing the ldap port to the host or keeping it in the network.
+- Additionally, should the interface be reachable via the nextcloud domain on a subpath?
\ No newline at end of file
diff --git a/community-containers/netdata/beta.json b/community-containers/netdata/beta.json
new file mode 100644
index 00000000000..05f14850669
--- /dev/null
+++ b/community-containers/netdata/beta.json
@@ -0,0 +1,63 @@
+{
+    "aio_services_v1": [
+        {
+            "container_name": "nextcloud-aio-netdata",
+            "display_name": "Netdata",
+            "image": "netdata/netdata",
+            "image_tag": "latest",
+            "ports": [
+                {
+                    "ip_binding": "",
+                    "port_number": "19999",
+                    "protocol": "tcp"
+                }
+            ],
+            "internal_port": "19999",
+            "restart": "unless-stopped",
+            "cap_add": [
+                "SYS_PTRACE"
+            ],
+            "environment": [
+                "TZ=%TIMEZONE%"
+            ],
+            "apparmor_unconfined": true,
+            "volumes": [
+                {
+                    "source": "nextcloud_aio_backup_netdata_config",
+                    "destination": "/etc/netdata",
+                    "writeable": true
+                },
+                {
+                    "source": "nextcloud_aio_backup_netdata_netdatalib",
+                    "destination": "/var/lib/netdata",
+                    "writeable": true
+                },
+                {
+                    "source": "nextcloud_aio_backup_netdata_netdatacache",
+                    "destination": "/var/cache/netdata",
+                    "writeable": true
+                },
+                {
+                    "source": "/etc/passwd",
+                    "destination": "/host/etc/passwd",
+                    "writeable": false
+                },
+                {
+                    "source": "/proc",
+                    "destination": "/host/proc",
+                    "writeable": false
+                },
+                {
+                    "source": "/sys",
+                    "destination": "/host/sys",
+                    "writeable": false
+                },
+                {
+                    "source": "/etc/os-release",
+                    "destination": "/host/etc/os-release",
+                    "writeable": false
+                }
+            ]
+        }
+    ]
+}
diff --git a/community-containers/netdata/latest.json b/community-containers/netdata/latest.json
new file mode 100644
index 00000000000..5bae51f01c7
--- /dev/null
+++ b/community-containers/netdata/latest.json
@@ -0,0 +1,63 @@
+{
+    "aio_services_v1": [
+        {
+            "container_name": "nextcloud-aio-netdata",
+            "display_name": "Netdata",
+            "image": "netdata/netdata",
+            "image_tag": "stable",
+            "ports": [
+                {
+                    "ip_binding": "",
+                    "port_number": "19999",
+                    "protocol": "tcp"
+                }
+            ],
+            "internal_port": "19999",
+            "restart": "unless-stopped",
+            "cap_add": [
+                "SYS_PTRACE"
+            ],
+            "environment": [
+                "TZ=%TIMEZONE%"
+            ],
+            "apparmor_unconfined": true,
+            "volumes": [
+                {
+                    "source": "nextcloud_aio_backup_netdata_config",
+                    "destination": "/etc/netdata",
+                    "writeable": true
+                },
+                {
+                    "source": "nextcloud_aio_backup_netdata_netdatalib",
+                    "destination": "/var/lib/netdata",
+                    "writeable": true
+                },
+                {
+                    "source": "nextcloud_aio_backup_netdata_netdatacache",
+                    "destination": "/var/cache/netdata",
+                    "writeable": true
+                },
+                {
+                    "source": "/etc/passwd",
+                    "destination": "/host/etc/passwd",
+                    "writeable": false
+                },
+                {
+                    "source": "/proc",
+                    "destination": "/host/proc",
+                    "writeable": false
+                },
+                {
+                    "source": "/sys",
+                    "destination": "/host/sys",
+                    "writeable": false
+                },
+                {
+                    "source": "/etc/os-release",
+                    "destination": "/host/etc/os-release",
+                    "writeable": false
+                }
+            ]
+        }
+    ]
+}
diff --git a/community-containers/netdata/readme.md b/community-containers/netdata/readme.md
new file mode 100644
index 00000000000..e0e44d285a9
--- /dev/null
+++ b/community-containers/netdata/readme.md
@@ -0,0 +1,3 @@
+TODO: 
+- Also think about publishing the interface port to the host or keeping it in the network.
+- Additionally, should the interface be reachable via the nextcloud domain on a subpath?
\ No newline at end of file