diff --git a/clusters/cl01tl/management/komodo/Chart.yaml b/clusters/cl01tl/management/komodo/Chart.yaml
index fe8b9f180..ab1f1b99c 100644
--- a/clusters/cl01tl/management/komodo/Chart.yaml
+++ b/clusters/cl01tl/management/komodo/Chart.yaml
@@ -10,8 +10,10 @@ keywords:
 home: https://wiki.alexlebens.dev/s/bb7eb683-b5c7-4f50-9f2c-e8e57dc67c81
 sources:
   - https://github.com/mbecker20/komodo
-  - https://github.com/mbecker20/komodo/pkgs/container/komodo
+  - https://github.com/cloudnative-pg/cloudnative-pg
+  - https://github.com/moghtech/komodo/pkgs/container/komodo-core
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
+  - https://github.com/alexlebens/helm-charts/charts/postgres-cluster
 maintainers:
   - name: alexlebens
 dependencies:
diff --git a/clusters/cl01tl/management/komodo/values.yaml b/clusters/cl01tl/management/komodo/values.yaml
index 6ac74ed99..bc900845b 100644
--- a/clusters/cl01tl/management/komodo/values.yaml
+++ b/clusters/cl01tl/management/komodo/values.yaml
@@ -8,12 +8,10 @@ komodo:
       containers:
         main:
           image:
-            repository: ghcr.io/mbecker20/komodo
-            tag: 1.16.12
+            repository: ghcr.io/moghtech/komodo-core
+            tag: 1.17.5
             pullPolicy: IfNotPresent
           env:
-            - name: COMPOSE_KOMODO_IMAGE_TAG
-              value: 1.16.12
             - name: COMPOSE_LOGGING_DRIVER
               value: local
             - name: KOMODO_HOST
@@ -52,6 +50,8 @@ komodo:
               value: true
             - name: KOMODO_TRANSPARENT_MODE
               value: false
+            - name: PERIPHERY_SSL_ENABLED
+              value: false
             - name: DB_USERNAME
               valueFrom:
                 secretKeyRef:
diff --git a/hosts/ps10rp/komodo-periphery/compose.yaml b/hosts/ps10rp/komodo-periphery/compose.yaml
index 2667dddfd..6174ee99f 100644
--- a/hosts/ps10rp/komodo-periphery/compose.yaml
+++ b/hosts/ps10rp/komodo-periphery/compose.yaml
@@ -39,7 +39,7 @@ services:
             - /var/run/docker.sock:/var/run/docker.sock
 
     komodo-periphery:
-        image: ghcr.io/mbecker20/periphery:latest
+        image: ghcr.io/moghtech/komodo-periphery:latest
         container_name: komodo-periphery
         env_file:
             - .env