diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 7275e197..91adda09 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -22,17 +22,20 @@ jobs:
       
       - name: Check if open PR exists
         id: check-opened-pr-step
+        continue-on-error: true
         run: |
+          echo "Logging into Gitea..."
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
+          echo "Setting default login to gitea-rinoa..."
           tea login default gitea-rinoa
-          pr_exists=$(tea pr list --repo ${{ github.repository }} --state open | egrep ${{ github.ref_name }} | wc -l)
+          echo "Checking for existing PRs..."
+          pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
+          echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT
 
       - name: Create PR
-        if: steps.check-opened-pr-step.outputs.exists == 0
+        if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
-          tea login default gitea-rinoa
           echo "Creating PR for branch: ${{ github.ref_name }}"
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
 
diff --git a/README.md b/README.md
index 778cd567..2f3679a5 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@
 | dagu-server | ghcr.io/dagu-org/dagu:latest |
 | delugevpn | ghcr.io/binhex/arch-delugevpn:latest |
 | docker-socket-proxy | ghcr.io/tecnativa/docker-socket-proxy:latest |
+| dockge | louislam/dockge:latest |
 | docuseal | docuseal/docuseal:latest |
 | duplicati | lscr.io/linuxserver/duplicati:latest |
 | fastenhealth | ghcr.io/fastenhealth/fasten-onprem:main |
@@ -67,10 +68,6 @@
 | jitsi-web | jitsi/web:stable |
 | joplin-db | postgres:17-alpine |
 | joplin | joplin/server:latest |
-| komodo-core | ghcr.io/mbecker20/komodo:latest |
-| komodo-ferretdb | ghcr.io/ferretdb/ferretdb |
-| komodo-periphery | ghcr.io/mbecker20/periphery:latest |
-| komodo-pg-db | postgres:17-alpine |
 | librespeed | lscr.io/linuxserver/librespeed:latest |
 | lidarr | lscr.io/linuxserver/lidarr:latest |
 | lidify | thewicklowwolf/lidify:latest |
diff --git a/docker-compose.yml b/docker-compose.yml
index 4159c33b..ca1810d3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -947,6 +947,34 @@ services:
         source: /var/run/docker.sock
         target: /var/run/docker.sock
         type: bind
+  dockge:
+    container_name: dockge
+    depends_on:
+      docker-socket-proxy:
+        condition: service_started
+        required: true
+    environment:
+      DOCKGE_STACKS_DIR: /opt/stacks
+    image: louislam/dockge:latest
+    labels:
+      homepage.group: System Administration
+      homepage.name: Dockge
+      homepage.href: https://dockge.${MY_TLD}
+      homepage.icon: dockge.svg
+      homepage.description: Docker Stack/Container Management
+      swag: enable
+      swag_port: 5001
+      swag_proto: http
+      swag_url: dockge.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://deluge.${MY_TLD}
+    ports:
+      - 5002:5001
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/dockge:/app/data
+      - ${HOME}/rinoa-docker:/opt/stacks
+    
   docuseal:
     container_name: docuseal
     image: docuseal/docuseal:latest
@@ -2685,70 +2713,6 @@ services:
         published: "22300"
         target: 22300
     restart: unless-stopped
-  komodo-core:
-    container_name: komodo-core
-    depends_on:
-      - komodo-ferretdb
-      - komodo-periphery
-    image: ghcr.io/mbecker20/komodo:latest
-    labels:
-      homepage.group: System Administration
-      homepage.name: Komodo
-      homepage.href: https://komodo.${MY_TLD}
-      homepage.icon: /icons/komodo.png
-      homepage.description: Open-source note taking & to-do
-      komodo.skip: a
-      swag: enable
-      swag_url: komodo.${MY_TLD}
-      swag_port: 9120
-      swag_proto: http
-    ports:
-      - 9120:9120
-    restart: always
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/komodo/core.config.toml:/config/config.toml
-  komodo-ferretdb:
-    container_name: komodo-ferretdb
-    depends_on:
-      - komodo-pg-db
-    image: ghcr.io/ferretdb/ferretdb
-    labels:
-      komodo.skip: a
-    restart: unless-stopped
-    expose:
-      - 27017
-    environment:
-      - FERRETDB_POSTGRESQL_URL=postgres://komodo-pg-db:5432/komodo
-  komodo-periphery:
-    container_name: komodo-periphery
-    environment:
-      DOCKER_HOST: tcp://dockerproxy:2375
-      PERIPHERY_PASSKEYS: ${KOMODO_PASSKEY}
-      PERIPHERY_SSL_ENABLED: false
-      PERIPHERY_INCLUDE_DISK_MOUNTS: /etc/hostname
-      # PERIPHERY_EXCLUDE_DISK_MOUNTS: /snap,/etc/repos
-    expose:
-      - 8120
-    image: ghcr.io/mbecker20/periphery:latest
-    labels:
-      komodo.skip: a
-    restart: always
-    volumes:
-      - /proc:/proc
-  komodo-pg-db:
-    container_name: komodo-pg-db
-    environment:
-      POSTGRES_USER: komodo
-      POSTGRES_PASSWORD: ${KOMODO_PG_DB_PASSWORD}
-      POSTGRES_DB: komodo
-    expose:
-      - 5432
-    labels:
-      komodo.skip: a
-    image: postgres:17-alpine
-    restart: unless-stopped
-    volumes:
-      - komodo-pg-data:/var/lib/postgresql/data
   librespeed:
     container_name: librespeed
     environment:
@@ -7118,8 +7082,6 @@ volumes:
     name: jitsi-web-admin-upload
   joplin_data:
     name: joplin_data
-  komodo-pg-data:
-    name: komodo-pg-data
   lldap_data:
     name: lldap_data
   localai_data: