diff --git a/.gitignore b/.gitignore
index e96319a..4687843 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,11 @@
+<<<<<<< HEAD
 .*~
 abra/catalogue
 abra/recipes
 abra/logs
+=======
+*~
+abra/catalogue
+abra/recipes
+abra/logs
+>>>>>>> origin/main
diff --git a/abra/servers/resisttechmonopolies.online/loomio.resisttechmonopolies.online.env b/abra/servers/laylotta.resisttechmonopolies.online/loomio.resisttechmonopolies.online.env
similarity index 94%
rename from abra/servers/resisttechmonopolies.online/loomio.resisttechmonopolies.online.env
rename to abra/servers/laylotta.resisttechmonopolies.online/loomio.resisttechmonopolies.online.env
index f8e473e..4247942 100644
--- a/abra/servers/resisttechmonopolies.online/loomio.resisttechmonopolies.online.env
+++ b/abra/servers/laylotta.resisttechmonopolies.online/loomio.resisttechmonopolies.online.env
@@ -1,4 +1,4 @@
-TYPE=loomio:5.1.2+v3.0.0
+TYPE=loomio:5.1.3+v3.0.0
 COMPOSE_FILE="compose.yml"
 
 DOMAIN=loomio.resisttechmonopolies.online
@@ -10,13 +10,13 @@ LETS_ENCRYPT_ENV=production
 COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 SUPPORT_EMAIL=besties@resisttechmonopolies.online
 SMTP_AUTH=plain
-SMTP_DOMAIN=smtp.protonmail.ch
-SMTP_SERVER=smtp.protonmail.ch
-SMTP_PORT=587
+SMTP_DOMAIN=mail.resisttechmonopolies.online
+SMTP_SERVER=mail.resisttechmonopolies.online
+SMTP_PORT=465
 SMTP_USERNAME=besties@resisttechmonopolies.online
-# SMTP_USE_SSL=1
+SMTP_USE_SSL=1
 # to disable SSL comment out line rather than changing to 0
-SECRET_SMTP_PASSWORD_VERSION=v2
+SECRET_SMTP_PASSWORD_VERSION=v4
 
 
 # From field for notification e-mails
@@ -104,4 +104,4 @@ OAUTH_ATTR_UID=email
 OAUTH_ATTR_NAME=name
 OAUTH_ATTR_EMAIL=email
 OAUTH_LOGIN_PROVIDER_NAME="loomio SSO"
-SECRET_OAUTH_APP_SECRET_VERSION=v2
+SECRET_OAUTH_APP_SECRET_VERSION=v2
\ No newline at end of file
diff --git a/abra/servers/laylotta.resisttechmonopolies.online/m.laylotta.resisttechmonopolies.online.env b/abra/servers/laylotta.resisttechmonopolies.online/m.laylotta.resisttechmonopolies.online.env
new file mode 100644
index 0000000..e9eaae2
--- /dev/null
+++ b/abra/servers/laylotta.resisttechmonopolies.online/m.laylotta.resisttechmonopolies.online.env
@@ -0,0 +1,85 @@
+TYPE=monitoring-ng:1.6.0+v1.8.1
+LETS_ENCRYPT_ENV=production
+COMPOSE_FILE=compose.yml
+DOMAIN=m.laylotta.resisttechmonopolies.online
+TIMEOUT=120
+ENABLE_BACKUPS=true
+
+## Enable this secret for Promtail / Prometheus
+# SECRET_BASIC_AUTH_VERSION=v1
+#
+# Promtail (Gathering Logs)
+# COMPOSE_FILE="$COMPOSE_FILE:compose.promtail.yml"
+# LOKI_PUSH_URL=https://loki.monitoring.example.org/loki/api/v1/push
+
+## Expose node and cadvisor ports instead of traefik
+# COMPOSE_FILE="$COMPOSE_FILE:compose.expose-ports.yml"
+
+# Monitoring Server
+#
+## Prometheus
+# COMPOSE_FILE="$COMPOSE_FILE:compose.prometheus.yml"
+# PROMETHEUS_RETENTION_TIME=1y
+#
+## Prometheus Pushgateway
+# COMPOSE_FILE="$COMPOSE_FILE:compose.pushgateway.yml"
+#
+## Loki
+# Loki Server
+#
+# COMPOSE_FILE="$COMPOSE_FILE:compose.loki.yml"
+#
+# Set to 0 to disable retention
+# LOKI_RETENTION_PERIOD=744h
+# LOKI_STORAGE_FILESYSTEM=1
+#
+## S3 Storage
+# LOKI_STORAGE_S3=1
+# LOKI_AWS_ENDPOINT=https://minio.autonomic.zone
+# LOKI_AWS_REGION=eu-west-1
+# LOKI_ACCESS_KEY_ID=bush-debrief-approval-robust-scraggly-molecule
+# LOKI_BUCKET_NAMES=loki
+# SECRET_LOKI_AWS_SECRET_ACCESS_KEY_VERSION=v1
+#
+## Grafana
+#
+# COMPOSE_FILE="$COMPOSE_FILE:compose.grafana.yml"
+# GF_SERVER_ROOT_URL=https://monitoring.example.com
+# SECRET_GRAFANA_ADMIN_PASSWORD_VERSION=v1
+## Seperate domain for Grafana
+#GRAFANA_DOMAIN=grafana.example.com
+#
+## Single-Sign-On with OIDC
+# OIDC_ENABLED=1
+# SECRET_GRAFANA_OIDC_CLIENT_SECRET_VERSION=v1
+# OIDC_CLIENT_ID=grafana
+# OIDC_AUTH_URL="https://authentik.example.com/application/o/authorize/"
+# OIDC_API_URL="https://authentik.example.com/application/o/userinfo/"
+# OIDC_TOKEN_URL="https://authentik.example.com/application/o/token/"
+#
+## Additional grafana settings (unlikely to require editing)
+# GF_SECURITY_ALLOW_EMBEDDING=1
+# GF_INSTALL_PLUGINS=grafana-piechart-panel
+#
+## grafana SMTP configuration (optional)
+# GF_SMTP_HOST=changeme
+# GF_SMTP_USER=changme
+# GF_SMTP_ENABLED=true
+# GF_SMTP_FROM_ADDRESS=grafana@example.com
+# GF_SMTP_SKIP_VERIFY=false
+# SECRET_GRAFANA_SMTP_PASSWORD_VERSION=v1
+#
+
+## Grafana Matrix Contact Point (optional)
+#COMPOSE_FILE="$COMPOSE_FILE:compose.matrix-alertmanager-receiver.yml"
+#SECRET_MATRIX_ACCESS_TOKEN_VERSION=v1
+#GF_MATRIX_USER_ID="<user-id>"
+#GF_MATRIX_ROOM_ID="<room-id>"
+#GF_MATRIX_HOMESERVER_URL="<homeserver-url>"
+
+# ALerts
+#ALERT_BACKUP_FAILED_ENABLED=true
+#ALERT_BACKUP_MISSING_ENABLED=true
+#ALERT_BACKUP_NOT_SUCCESSFULL_ENABLED=true
+#ALERT_NODE_DISK_SPACE_ENABLED=true
+#ALERT_NODE_MEMORY_USAGE_ENABLED=true
\ No newline at end of file
diff --git a/abra/servers/laylotta.resisttechmonopolies.online/scj.laylotta.resisttechmonopolies.online.env b/abra/servers/laylotta.resisttechmonopolies.online/scj.laylotta.resisttechmonopolies.online.env
new file mode 100644
index 0000000..1136308
--- /dev/null
+++ b/abra/servers/laylotta.resisttechmonopolies.online/scj.laylotta.resisttechmonopolies.online.env
@@ -0,0 +1,5 @@
+RECIPE=swarm-cronjob:1.11.0+1.15.0
+
+TZ=UTC
+LOG_LEVEL=info
+LOG_JSON=false
\ No newline at end of file
diff --git a/abra/servers/laylotta.resisttechmonopolies.online/t.laylotta.resisttechmonopolies.online.env b/abra/servers/laylotta.resisttechmonopolies.online/t.laylotta.resisttechmonopolies.online.env
index 5602bb7..35a3c81 100644
--- a/abra/servers/laylotta.resisttechmonopolies.online/t.laylotta.resisttechmonopolies.online.env
+++ b/abra/servers/laylotta.resisttechmonopolies.online/t.laylotta.resisttechmonopolies.online.env
@@ -96,9 +96,9 @@ COMPOSE_FILE="compose.yml"
 
 ## BASIC_AUTH
 ## Use httpasswd to generate the secret
-#COMPOSE_FILE="$COMPOSE_FILE:compose.basicauth.yml"
-#BASIC_AUTH=1
-#SECRET_USERSFILE_VERSION=v1
+COMPOSE_FILE="$COMPOSE_FILE:compose.basicauth.yml"
+BASIC_AUTH=1
+SECRET_USERSFILE_VERSION=v1
 
 #####################################################################
 # Prometheus metrics                                                #
diff --git a/abra/servers/mango.resisttechmonopolies.online/bbt.mango.resisttechmonopolies.online.env b/abra/servers/mango.resisttechmonopolies.online/bbt.mango.resisttechmonopolies.online.env
new file mode 100644
index 0000000..2bee5cb
--- /dev/null
+++ b/abra/servers/mango.resisttechmonopolies.online/bbt.mango.resisttechmonopolies.online.env
@@ -0,0 +1,34 @@
+TYPE=backup-bot-two:2.3.0+2.3.0-beta
+
+SECRET_RESTIC_PASSWORD_VERSION=v1
+
+COMPOSE_FILE=compose.yml
+
+RESTIC_REPOSITORY=/backups/restic
+
+CRON_SCHEDULE='30 3 * * *'
+
+# Push Notifiactions
+#PUSH_URL_START=https://status.example.com/api/push/xxxxxxxxxx?status=up&msg=start
+#PUSH_URL_SUCCESS=https://status.example.com/api/push/xxxxxxxxxx?status=up&msg=OK
+#PUSH_URL_FAIL=https://status.example.com/api/push/xxxxxxxxxx?status=down&msg=fail
+
+# swarm-cronjob, instead of built-in cron
+#COMPOSE_FILE="$COMPOSE_FILE:compose.swarm-cronjob.yml"
+
+# SSH storage
+#SECRET_SSH_KEY_VERSION=v1
+#SSH_HOST_KEY="hostname ssh-rsa AAAAB3...
+#COMPOSE_FILE="$COMPOSE_FILE:compose.ssh.yml"
+
+# S3 storage
+#SECRET_AWS_SECRET_ACCESS_KEY_VERSION=v1
+#AWS_ACCESS_KEY_ID=something-secret
+#COMPOSE_FILE="$COMPOSE_FILE:compose.s3.yml"
+
+# Secret restic repository
+# use a secret to store the RESTIC_REPOSITORY if the repository location contains a secret value
+# i.E rest:https://user:SECRET_PASSWORD@host:8000/
+# it overwrites the RESTIC_REPOSITORY variable
+SECRET_RESTIC_REPO_VERSION=v2
+COMPOSE_FILE="$COMPOSE_FILE:compose.secret.yml"
\ No newline at end of file
diff --git a/abra/servers/resisttechmonopolies.online/scj.sootie.resisttechmonopolies.online.env b/abra/servers/resisttechmonopolies.online/scj.sootie.resisttechmonopolies.online.env
new file mode 100644
index 0000000..1136308
--- /dev/null
+++ b/abra/servers/resisttechmonopolies.online/scj.sootie.resisttechmonopolies.online.env
@@ -0,0 +1,5 @@
+RECIPE=swarm-cronjob:1.11.0+1.15.0
+
+TZ=UTC
+LOG_LEVEL=info
+LOG_JSON=false
\ No newline at end of file