diff --git a/servapps/Baikal/cosmos-compose.json b/servapps/Baikal/cosmos-compose.json
new file mode 100644
index 00000000..e9137f71
--- /dev/null
+++ b/servapps/Baikal/cosmos-compose.json
@@ -0,0 +1,67 @@
+{
+  "cosmos-installer": {
+    "form": [
+      {
+        "name": "adminOnly",
+        "label": "Do you want to make this service admin only?",
+        "initialValue": false,
+        "type": "checkbox"
+      },
+      {
+        "name": "baikaldata",
+        "label": "Where do you want to store Baikal's data?",
+        "initialValue": "/var/www/baikal/Specific",
+        "type": "text"
+      },
+    ]
+  },
+  "services": {
+    "{ServiceName}": {
+      "image": "ckulka/baikal:nginx",
+      "restart": "always",
+      "volumes": [
+        {
+          "source": "{ServiceName}-config",
+          "target": "/var/www/baikal/config",
+          "type": "volume"
+        },
+        {
+          "source": "{ServiceName}-data",
+          "target": "{Context.baikaldata}",
+          "type": "bind"
+        }
+      ],
+      "container_name": "{ServiceName}",
+      "labels": {
+        "cosmos-auto-update": "true",
+        "cosmos-icon": "https://azukaar.github.io/cosmos-servapps-official/servapps/Baikal/icon.png"
+      },
+      "network_mode": "cosmos-{ServiceName}-default",
+      "routes": [
+        {
+          "name": "{ServiceName}",
+          "description": "Expose {ServiceName} to the web",
+          "useHost": true,
+          "target": "http://{ServiceName}:80",
+          "mode": "SERVAPP",
+          "Timeout": 14400000,
+          "ThrottlePerMinute": 12000,
+          "BlockCommonBots": true,
+          "SmartShield": {
+            "Enabled": true
+          }
+          {if Context.adminOnly}
+           , "AuthAdmin": true
+          {/if}
+        }
+      ]
+    }
+  },
+  "volumes": {
+    "{ServiceName}-config": {},
+    "{ServiceName}-data": {}
+  },
+  "networks": {
+    "cosmos-{ServiceName}-default": {}
+  }
+}
diff --git a/servapps/Baikal/description.json b/servapps/Baikal/description.json
new file mode 100644
index 00000000..43290836
--- /dev/null
+++ b/servapps/Baikal/description.json
@@ -0,0 +1,9 @@
+{
+    "name": "Baikal",
+    "longDescription": "<p>Baïkal is a lightweight CalDAV+CardDAV server. It offers an extensive web interface with easy management of users, address books and calendars. It is fast and simple to install and only needs a basic php capable server. The data can be stored in a MySQL or a SQLite database.< /p>",
+    "description": " Baïkal is a Calendar+Contacts server ",
+    "tags": ["emulation", "games", "self-hosted", "open-source", "Gaseous"],
+    "repository": "https://github.com/sabre-io/Baikal",
+    "image": "https://hub.docker.com/r/ckulka/baikal",
+    "supported_architectures": ["amd64", "arm64"]
+}
diff --git a/servapps/Baikal/icon.png b/servapps/Baikal/icon.png
new file mode 100644
index 00000000..1a623ea3
Binary files /dev/null and b/servapps/Baikal/icon.png differ
diff --git a/servapps/Gaseous/cosmos-compose.json b/servapps/Gaseous/cosmos-compose.json
new file mode 100644
index 00000000..f1b73474
--- /dev/null
+++ b/servapps/Gaseous/cosmos-compose.json
@@ -0,0 +1,104 @@
+{
+  "cosmos-installer": {
+    "form": [
+      {
+        "name": "igclientid",
+        "label": "What is your internet games client id? See: https://api-docs.igdb.com/#account-creation to set up",
+        "type": "text"
+      },
+      {
+        "name": "igclientsecret",
+        "label": "What is your internet games client secret?",
+        "type": "text"
+      }
+    ]
+  },
+
+  "services": {
+    "{ServiceName}": {
+      "container_name": "{ServiceName}",
+      "image": "gaseousgames/gaseousserver:latest",
+      "build": {
+        "context": "./",
+        "dockerfile": "./build/Dockerfile"
+      },
+      "restart": "unless-stopped",
+      "networks": {
+        "{ServiceName}": {}
+      },
+      "routes": [
+        {
+          "name": "{ServiceName}",
+          "description": "Expose {ServiceName} to the web",
+          "useHost": true,
+          "target": "http://{ServiceName}:80",
+          "mode": "SERVAPP",
+          "Timeout": 14400000,
+          "ThrottlePerMinute": 12000,
+          "BlockCommonBots": true,
+          "SmartShield": {
+            "Enabled": true
+          }
+        }
+      ],
+      "volumes": [
+        {
+          "source": "{ServiceName}",
+          "target": "/home/gaseous/.gaseous-server",
+          "type": "volume"
+        }
+      ],
+      "environment": [
+        "TZ",
+        "dbhost={ServiceName}-db",
+        "dbuser=root",
+        "dbpass={Passwords.0}",
+        "igdbclientid={Context.igclientid}",
+        "igdbclientsecret={Context.igclientsecret}"
+      ],
+      "hostname": "{ServiceName}",
+      "network_mode": "cosmos-{ServiceName}-default",
+      "labels": {
+        "cosmos.stack": "{ServiceName}",
+        "cosmos.stack.main": "{ServiceName}",
+        "cosmos-auto-update": "true",
+        "cosmos-icon": "https://azukaar.github.io/cosmos-servapps-official/servapps/Gaseous/icon.png"
+      }
+    },
+    "{ServiceName}-db": {
+      "container_name": "{ServiceName}-db",
+      "image": "mariadb",
+      "restart": "unless-stopped",
+      "networks": {
+        "{ServiceName}": {}
+      },
+      "volumes": [
+        {
+          "source": "{ServiceName}-db",
+          "target": "/var/lib/mysql",
+          "type": "volume"
+        }
+      ],
+      "environment": [
+        "MARIADB_ROOT_PASSWORD={Passwords.0}",
+        "MARIADB_USER=gaseous",
+        "MARIADB_PASSWORD={Passwords.1}"
+      ],
+      "hostname": "{ServiceName}-db",
+      "network_mode": "cosmos-{ServiceName}-default",
+      "labels": {
+        "cosmos.stack": "{ServiceName}",
+        "cosmos.stack.main": "{ServiceName}",
+        "cosmos-auto-update": "true"
+      }
+    }
+  },
+  "networks": {
+    "{ServiceName}": {},
+    "cosmos-{ServiceName}-default": {}
+  },
+  "volumes": {
+    "{ServiceName}": {},
+    "{ServiceName}-db": {}
+  }
+}
diff --git a/servapps/Gaseous/description.json b/servapps/Gaseous/description.json
new file mode 100644
index 00000000..a7ed8542
--- /dev/null
+++ b/servapps/Gaseous/description.json
@@ -0,0 +1,9 @@
+{
+    "name": "Gaseous-server",
+    "longDescription": "<p>A game ROM manager, with a built in web based emulator using multiple sources to identify and provide metadata < /p>",
+    "description": "A game ROM manager, with a built in web based emulator using multiple sources to identify and provide metadata ",
+    "tags": ["emulation", "games", "self-hosted", "open-source", "Gaseous"],
+    "repository": "https://github.com/gaseous-project/gaseous-server",
+    "image": "https://hub.docker.com/r/gaseousgames/gaseousserver",
+    "supported_architectures": ["amd64", "arm64"]
+}
diff --git a/servapps/Gaseous/icon.png b/servapps/Gaseous/icon.png
new file mode 100644
index 00000000..d13f0244
Binary files /dev/null and b/servapps/Gaseous/icon.png differ