diff --git a/upstream/habitica/habitica b/upstream/habitica/habitica
new file mode 160000
index 0000000..75c9731
--- /dev/null
+++ b/upstream/habitica/habitica
@@ -0,0 +1 @@
+Subproject commit 75c9731ca47c254a0e25226a70d37372ef9a2694
diff --git a/utility/metrics/docker-compose.yml b/utility/metrics/docker-compose.yml
new file mode 100644
index 0000000..a22c087
--- /dev/null
+++ b/utility/metrics/docker-compose.yml
@@ -0,0 +1,12 @@
+version: '3.8'
+services:
+  metrics:
+    image: ghcr.io/lowlighter/metrics:latest
+    container_name: metrics
+    entrypoint: ""
+    command: ["npm", "start"]
+    ports:
+      - "127.0.0.1:2002:3000"
+    volumes:
+      - /path/to/settings.json:/metrics/settings.json
+    restart: no
\ No newline at end of file
diff --git a/utility/wakaapi/docker-compose.yml b/utility/wakaapi/docker-compose.yml
new file mode 100644
index 0000000..6de2521
--- /dev/null
+++ b/utility/wakaapi/docker-compose.yml
@@ -0,0 +1,15 @@
+version: '3.8'
+services:
+  wakaapi-tsys:
+    image: ghcr.io/muety/wakapi:latest
+    container_name: wakaapi-tsys
+    environment:
+      - WAKAPI_PASSWORD_SALT=1234
+    volumes:
+      - wakapi-data-tsys:/data
+    ports:
+      - "2001:3000"
+    restart: always
+
+volumes:
+  wakapi-data-tsys:
\ No newline at end of file
diff --git a/webapps/beaverhabits/docker-compose.yml b/webapps/beaverhabits/docker-compose.yml
new file mode 100644
index 0000000..556eeeb
--- /dev/null
+++ b/webapps/beaverhabits/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '3.8'
+services:
+  beaverhabits:
+    image: daya0576/beaverhabits:latest
+    container_name: beaverhabits
+    environment:
+      - FIRST_DAY_OF_WEEK=0
+      - HABITS_STORAGE=USER_DISK
+      - MAX_USER_COUNT=1
+    volumes:
+      - /path/to/host/directory:/app/.user/
+    ports:
+      - "8080:8080"
+    restart: unless-stopped
\ No newline at end of file
diff --git a/upstream/habitica/docker-compose.yml b/webapps/habitica/docker-compose.yml
similarity index 82%
rename from upstream/habitica/docker-compose.yml
rename to webapps/habitica/docker-compose.yml
index 8ef78d4..9def471 100644
--- a/upstream/habitica/docker-compose.yml
+++ b/webapps/habitica/docker-compose.yml
@@ -6,9 +6,9 @@ services:
     networks:
       - habitica
     environment:
-      - BASE_URL=http://server:3000
+      - BASE_URL=http://tsys1:2008
     ports:
-        - "8080:8080"
+        - "2008:8080"
     command: ["npm", "run", "client:dev"]
     depends_on:
       - server
@@ -16,7 +16,7 @@ services:
   server:
     build: .
     ports:
-      - "3000:3000"
+      - "3008:3000"
     networks:
       - habitica
     environment:
@@ -33,4 +33,4 @@ services:
 
 networks:
   habitica:
-    driver: bridge
+    driver: bridge
\ No newline at end of file