diff --git a/lib/functions.sh b/lib/functions.sh
index a3e7504..68b7ad8 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -1,7 +1,7 @@
 # Federated Computer functions
 
 # Define all services
-SERVICES=("pdnsmysql" "pdns" "pdnsadmin" "traefik" "postgresql" "ldap" "mail" "collabora" "nextcloud" "matrix" "element" "listmonk" "vaultwarden" "panel" "wireguard" "jitsi" "baserow" "gitea" "caddy" "autodiscover" "castopod" "wordpress" "coturn" "bookstack" "freescout" "msp" "espocrm" "nginx")
+SERVICES=("pdnsmysql" "pdns" "pdnsadmin" "traefik" "postgresql" "ldap" "mail" "collabora" "nextcloud" "matrix" "element" "listmonk" "vaultwarden" "panel" "wireguard" "jitsi" "baserow" "gitea" "caddy" "autodiscover" "castopod" "wordpress" "coturn" "bookstack" "freescout" "msp" "espocrm" "nginx" "matrixslack" "matrixsignal")
 
 fail() {
   echo -ne "FAILED\n\n$1\n\n"
diff --git a/lib/matrixsignal.sh b/lib/matrixsignal.sh
new file mode 100644
index 0000000..381222c
--- /dev/null
+++ b/lib/matrixsignal.sh
@@ -0,0 +1,106 @@
+#!/bin/bash
+#
+# Matrix Signal Service
+
+PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+config_matrixsignal() {
+  echo -ne "\n* Configuring /federated/apps/matrixsignal container.."
+  spin &
+  SPINPID=$!
+
+  if [ ! -d "/federated/apps/matrixsignal" ]; then
+    mkdir -p /federated/apps/matrixsignal/data
+  fi
+
+cat > /federated/apps/matrixsignal/docker-compose.yml <<EOF
+version: '3.7'
+
+services:
+  matrixsignal:
+    image: dock.mau.dev/mautrix/signal:\${IMAGE_VERSION}
+    container_name: matrixsignal
+    hostname: matrixsignal.$DOMAIN
+    domainname: $DOMAIN
+    restart: always
+    networks:
+      federated:
+        ipv4_address: 172.99.0.81
+    env_file:
+      - ./.env
+    volumes:
+      - ./data:/data
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.matrixsignal.rule=Host(\`matrixsignal.$DOMAIN\`)"
+      - "traefik.http.routers.matrixsignal.entrypoints=websecure"
+      - "traefik.http.routers.matrixsignal.tls.certresolver=letsencrypt"
+
+networks:
+  federated:
+    external: true
+EOF
+
+MATRIXSIGNAL_SECRET=$(create_password);
+
+# Run to create the config file
+docker run --rm -v /federated/apps/matrixsignal/data:/data:z dock.mau.dev/mautrix/signal:latest
+
+cat > /federated/apps/matrixsignal/.env <<EOF
+IMAGE_VERSION="latest"
+EOF
+chmod 600 /federated/apps/matrixsignal/.env
+
+# Change config values in config.yaml
+sed -i '0,/address:.*/s//address: http:\/\/172.99.0.19:8008/' /federated/apps/matrixsignal/data/config.yaml
+sed -i "s/localhost/172.99.0.81/g" /federated/apps/matrixsignal/data/config.yaml
+sed -i "s#domain:.*#domain: matrix.$DOMAIN#g" /federated/apps/matrixsignal/data/config.yaml
+sed -i "s#uri:.*#uri: postgres://matrixsignal:$MATRIXSIGNAL_SECRET@postgresql.$DOMAIN/matrixsignal?sslmode=disable#g" /federated/apps/matrixsignal/data/config.yaml
+sed -i "s/example.com/matrix.$DOMAIN/g" /federated/apps/matrixsignal/data/config.yaml
+
+# Create database and user in postgresql
+docker exec postgresql psql -U postgres -c "CREATE USER matrixsignal WITH PASSWORD '$MATRIXSIGNAL_SECRET'" &> /dev/null
+docker exec postgresql psql -U postgres -c "CREATE DATABASE matrixsignal" &> /dev/null
+docker exec postgresql psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE matrixsignal TO matrixsignal" &> /dev/null
+
+# Run again to create the registration file
+docker run --rm -v /federated/apps/matrixsignal/data:/data:z dock.mau.dev/mautrix/signal:latest
+
+# Insert our Matrix Slack config into Matrix homeserverl.yaml
+cp /federated/apps/matrixsignal/data/registration.yaml /federated/apps/matrix/data/matrix/matrixsignal-registration.yaml
+cat >> /federated/apps/matrix/data/matrix/homeserver.yaml <<EOF
+app_service_config_files:
+- /data/matrixsignal-registration.yaml
+EOF
+
+# Set permissions
+chown -R 991:991 /federated/apps/matrix/data/matrix
+ 
+kill -9 $SPINPID &> /dev/null
+echo -ne "done."
+}
+start_matrixsignal() {
+  # Start service with command to make sure it's up before proceeding
+  start_service "matrixsignal" "nc -z 172.99.0.81 29335 &> /dev/null" "7"
+
+  kill -9 $SPINPID &> /dev/null
+  echo -ne "done."
+}
+uninstall_matrixsignal() {
+  echo -ne "* Uninstalling matrixsignal container.."
+  spin &
+  SPINPID=$!
+
+  # First stop the service
+  cd /federated/apps/matrixsignal && docker-compose -f docker-compose.yml -p matrixsignal down &> /dev/null
+
+  # Delete database and user in postgresql
+  docker exec postgresql psql -U postgres -c "DROP DATABASE matrixsignal" &> /dev/null
+  docker exec postgresql psql -U postgres -c "DROP USER matrixsignal" &> /dev/null
+
+  # Delete the app directory
+  rm -rf /federated/apps/matrixsignal
+
+  kill -9 $SPINPID &> /dev/null
+  echo -ne "done.\n"
+}
diff --git a/lib/matrixslack.sh b/lib/matrixslack.sh
new file mode 100644
index 0000000..50b3ce4
--- /dev/null
+++ b/lib/matrixslack.sh
@@ -0,0 +1,106 @@
+#!/bin/bash
+#
+# Matrix Slack Service
+
+PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+config_matrixslack() {
+  echo -ne "\n* Configuring /federated/apps/matrixslack container.."
+  spin &
+  SPINPID=$!
+
+  if [ ! -d "/federated/apps/matrixslack" ]; then
+    mkdir -p /federated/apps/matrixslack/data
+  fi
+
+cat > /federated/apps/matrixslack/docker-compose.yml <<EOF
+version: '3.7'
+
+services:
+  matrixslack:
+    image: dock.mau.dev/mautrix/slack:\${IMAGE_VERSION}
+    container_name: matrixslack
+    hostname: matrixslack.$DOMAIN
+    domainname: $DOMAIN
+    restart: always
+    networks:
+      federated:
+        ipv4_address: 172.99.0.80
+    env_file:
+      - ./.env
+    volumes:
+      - ./data:/data
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.matrixslack.rule=Host(\`matrixslack.$DOMAIN\`)"
+      - "traefik.http.routers.matrixslack.entrypoints=websecure"
+      - "traefik.http.routers.matrixslack.tls.certresolver=letsencrypt"
+
+networks:
+  federated:
+    external: true
+EOF
+
+MATRIXSLACK_SECRET=$(create_password);
+
+# Run to create the config file
+docker run --rm -v /federated/apps/matrixslack/data:/data:z dock.mau.dev/mautrix/slack:latest
+
+cat > /federated/apps/matrixslack/.env <<EOF
+IMAGE_VERSION="latest"
+EOF
+chmod 600 /federated/apps/matrixslack/.env
+
+# Change config values in config.yaml
+sed -i '0,/address:.*/s//address: http:\/\/172.99.0.19:8008/' /federated/apps/matrixslack/data/config.yaml
+sed -i "s/localhost/172.99.0.80/g" /federated/apps/matrixslack/data/config.yaml
+sed -i "s#domain:.*#domain: matrix.$DOMAIN#g" /federated/apps/matrixslack/data/config.yaml
+sed -i "s#uri:.*#uri: postgres://matrixslack:$MATRIXSLACK_SECRET@postgresql.$DOMAIN/matrixslack?sslmode=disable#g" /federated/apps/matrixslack/data/config.yaml
+sed -i "s/example.com/matrix.$DOMAIN/g" /federated/apps/matrixslack/data/config.yaml
+
+# Create database and user in postgresql
+docker exec postgresql psql -U postgres -c "CREATE USER matrixslack WITH PASSWORD '$MATRIXSLACK_SECRET'" &> /dev/null
+docker exec postgresql psql -U postgres -c "CREATE DATABASE matrixslack" &> /dev/null
+docker exec postgresql psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE matrixslack TO matrixslack" &> /dev/null
+
+# Run again to create the registration file
+docker run --rm -v /federated/apps/matrixslack/data:/data:z dock.mau.dev/mautrix/slack:latest
+
+# Insert our Matrix Slack config into Matrix homeserverl.yaml
+cp /federated/apps/matrixslack/data/registration.yaml /federated/apps/matrix/data/matrix/matrixslack-registration.yaml
+cat >> /federated/apps/matrix/data/matrix/homeserver.yaml <<EOF
+app_service_config_files:
+- /data/matrixslack-registration.yaml
+EOF
+
+# Set permissions
+chown -R 991:991 /federated/apps/matrix/data/matrix
+ 
+kill -9 $SPINPID &> /dev/null
+echo -ne "done."
+}
+start_matrixslack() {
+  # Start service with command to make sure it's up before proceeding
+  start_service "matrixslack" "nc -z 172.99.0.80 29335 &> /dev/null" "7"
+
+  kill -9 $SPINPID &> /dev/null
+  echo -ne "done."
+}
+uninstall_matrixslack() {
+  echo -ne "* Uninstalling matrixslack container.."
+  spin &
+  SPINPID=$!
+
+  # First stop the service
+  cd /federated/apps/matrixslack && docker-compose -f docker-compose.yml -p matrixslack down &> /dev/null
+
+  # Delete database and user in postgresql
+  docker exec postgresql psql -U postgres -c "DROP DATABASE matrixslack" &> /dev/null
+  docker exec postgresql psql -U postgres -c "DROP USER matrixslack" &> /dev/null
+
+  # Delete the app directory
+  rm -rf /federated/apps/matrixslack
+
+  kill -9 $SPINPID &> /dev/null
+  echo -ne "done.\n"
+}