diff --git a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
index a6f1222..7f3258a 100644
--- a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
+++ b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
@@ -17,85 +17,86 @@ spec:
         app.kubernetes.io/name: hydra-oidc
     spec:
       containers:
-        - name: hydra-oidc-php-fpm
-          image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
-          imagePullPolicy: Always
-          args: ["/usr/sbin/php-fpm81", "-F", "-e"]
-          readinessProbe:
-            exec:
-              command:
-                - sh
-                - -c
-                - test -f /etc/php81/php-fpm.d/www.conf
-          livenessProbe:
-            exec:
-              command:
-                - php
-                - bin/console
-                - -V
-            initialDelaySeconds: 10
-            periodSeconds: 30
-          env:
-            - name: PHP_FPM_LISTEN
-              value: 127.0.0.1:9000
-            - name: PHP_MEMORY_LIMIT
-              value: 128m
-            - name: PHP_FPM_MEMORY_LIMIT
-              value: 128m
-          envFrom:
-            - configMapRef:
-                name: hydra-oidc-env
-          resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
+      - name: hydra-oidc-php-fpm
+        image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
+        imagePullPolicy: Always
+        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
+        readinessProbe:
+          exec:
+            command:
+              - sh
+              - -c
+              - test -f /etc/php81/php-fpm.d/www.conf
+        livenessProbe:
+          exec:
+            command:
+              - php
+              - bin/console
+              - -V
+          initialDelaySeconds: 10
+          periodSeconds: 30
+        env:
+          - name: PHP_FPM_LISTEN
+            value: 127.0.0.1:9000
+          - name: PHP_MEMORY_LIMIT
+            value: 128m
+          - name: PHP_FPM_MEMORY_LIMIT
+            value: 128m
+        envFrom:
+          - configMapRef:
+              name: hydra-oidc-env
+        resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
 
-        - image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
-          imagePullPolicy: Always
-          name: hydra-oidc-caddy
-          args:
-            [
-              "/usr/sbin/caddy",
-              "run",
-              "--adapter",
-              "caddyfile",
-              "--config",
-              "/etc/caddy/Caddyfile",
-            ]
-          readinessProbe:
-            httpGet:
-              path: /healthy
-              port: 8080
-            initialDelaySeconds: 5
-            timeoutSeconds: 5
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /healthy
-              port: 8080
-            initialDelaySeconds: 15
-            timeoutSeconds: 5
-            periodSeconds: 15
-          ports:
-            - containerPort: 8080
-          envFrom:
-            - configMapRef:
-                name: hydra-oidc-env
-          env:
-            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
-              value: 127.0.0.1:9000
-            - name: CADDY_HTTPS_PORT
-              value: "8443"
-            - name: CADDY_HTTP_PORT
-              value: "8080"
-            - name: CADDY_DATA_FS
-              value: "/tmp/caddy"
-            - name: CADDY_APP_ROOT_PUBLIC
-              value: "/app/public/"
-          resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
+      - name: hydra-oidc-caddy
+        image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
+        imagePullPolicy: Always
+        args:
+          [
+            "/usr/sbin/caddy",
+            "run",
+            "--adapter",
+            "caddyfile",
+            "--config",
+            "/etc/caddy/Caddyfile",
+          ]
+        readinessProbe:
+          httpGet:
+            path: /healthy
+            port: 8080
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+          periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /healthy
+            port: 8080
+          initialDelaySeconds: 15
+          timeoutSeconds: 5
+          periodSeconds: 15
+        ports:
+          - containerPort: 8080
+            name: oidc-http-port
+        envFrom:
+          - configMapRef:
+              name: hydra-oidc-env
+        env:
+          - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
+            value: 127.0.0.1:9000
+          - name: CADDY_HTTPS_PORT
+            value: "8443"
+          - name: CADDY_HTTP_PORT
+            value: "8080"
+          - name: CADDY_DATA_FS
+            value: "/tmp/caddy"
+          - name: CADDY_APP_ROOT_PUBLIC
+            value: "/app/public/"
+        resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
       restartPolicy: Always
diff --git a/components/hydra-oidc/resources/hydra-oidc-service.yaml b/components/hydra-oidc/resources/hydra-oidc-service.yaml
index 8cc03d1..9427d93 100644
--- a/components/hydra-oidc/resources/hydra-oidc-service.yaml
+++ b/components/hydra-oidc/resources/hydra-oidc-service.yaml
@@ -6,8 +6,9 @@ metadata:
   name: hydra-oidc
 spec:
   ports:
-    - name: hydra-oidc
-      port: 8080
+  - name: oidc-http-port
+    port: 8080
+    targePort: oidc-http-port
   selector:
     app.kubernetes.io/name: hydra-oidc
 status:
diff --git a/components/hydra-sql/resources/hydra-sql-deployment.yaml b/components/hydra-sql/resources/hydra-sql-deployment.yaml
index 92e47af..a1261fc 100644
--- a/components/hydra-sql/resources/hydra-sql-deployment.yaml
+++ b/components/hydra-sql/resources/hydra-sql-deployment.yaml
@@ -17,97 +17,98 @@ spec:
         app.kubernetes.io/name: hydra-sql
     spec:
       containers:
-        - name: hydra-sql-fpm
-          image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
-          imagePullPolicy: Always
-          args: ["/usr/sbin/php-fpm81", "-F", "-e"]
-          readinessProbe:
-            exec:
-              command:
-                - sh
-                - -c
-                - test -f /etc/php81/php-fpm.d/www.conf
-          livenessProbe:
-            exec:
-              command:
-                - php
-                - bin/console
-                - -V
-            initialDelaySeconds: 10
-            periodSeconds: 30
-          resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
-          envFrom:
-            - configMapRef:
-                name: hydra-sql-env
-          env:
-            - name: PHP_FPM_LISTEN
-              value: 127.0.0.1:9000
-            - name: PHP_MEMORY_LIMIT
-              value: 128m
-            - name: PHP_FPM_MEMORY_LIMIT
-              value: 128m
-            - name: PHP_FPM_LOG_LEVEL
-              value: warning
-          volumeMounts:
-            - name: sql-login-config
-              mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-              subPath: "sql_login.yaml"
+      - name: hydra-sql-fpm
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
+        imagePullPolicy: Always
+        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
+        readinessProbe:
+          exec:
+            command:
+              - sh
+              - -c
+              - test -f /etc/php81/php-fpm.d/www.conf
+        livenessProbe:
+          exec:
+            command:
+              - php
+              - bin/console
+              - -V
+          initialDelaySeconds: 10
+          periodSeconds: 30
+        resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
+        envFrom:
+          - configMapRef:
+              name: hydra-sql-env
+        env:
+          - name: PHP_FPM_LISTEN
+            value: 127.0.0.1:9000
+          - name: PHP_MEMORY_LIMIT
+            value: 128m
+          - name: PHP_FPM_MEMORY_LIMIT
+            value: 128m
+          - name: PHP_FPM_LOG_LEVEL
+            value: warning
+        volumeMounts:
+          - name: sql-login-config
+            mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
+            subPath: "sql_login.yaml"
 
-        - name: hydra-sql-caddy
-          image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
-          imagePullPolicy: Always
-          args:
-            [
-              "/usr/sbin/caddy",
-              "run",
-              "--adapter",
-              "caddyfile",
-              "--config",
-              "/etc/caddy/Caddyfile",
-            ]
-          readinessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-            initialDelaySeconds: 5
-            timeoutSeconds: 5
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-            initialDelaySeconds: 15
-            timeoutSeconds: 5
-            periodSeconds: 15
-          envFrom:
-            - configMapRef:
-                name: hydra-sql-env
-          env:
-            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
-              value: 127.0.0.1:9000
-            - name: CADDY_HTTPS_PORT
-              value: "8443"
-            - name: CADDY_HTTP_PORT
-              value: "8080"
-            - name: CADDY_DATA_FS
-              value: "/tmp/caddy"
-            - name: CADDY_APP_ROOT_PUBLIC
-              value: "/app/public/"
-          resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
-          ports:
-            - containerPort: 8080
-          volumeMounts:
-            - name: sql-login-config
-              mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-              subPath: "sql_login.yaml"
+      - name: hydra-sql-caddy
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
+        imagePullPolicy: Always
+        args:
+          [
+            "/usr/sbin/caddy",
+            "run",
+            "--adapter",
+            "caddyfile",
+            "--config",
+            "/etc/caddy/Caddyfile",
+          ]
+        readinessProbe:
+          httpGet:
+            path: /health
+            port: 8080
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+          periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 8080
+          initialDelaySeconds: 15
+          timeoutSeconds: 5
+          periodSeconds: 15
+        envFrom:
+          - configMapRef:
+              name: hydra-sql-env
+        env:
+          - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
+            value: 127.0.0.1:9000
+          - name: CADDY_HTTPS_PORT
+            value: "8443"
+          - name: CADDY_HTTP_PORT
+            value: "8080"
+          - name: CADDY_DATA_FS
+            value: "/tmp/caddy"
+          - name: CADDY_APP_ROOT_PUBLIC
+            value: "/app/public/"
+        resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
+        ports:
+          - containerPort: 8080
+            name: sql-http-port
+        volumeMounts:
+          - name: sql-login-config
+            mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
+            subPath: "sql_login.yaml"
       volumes:
         - name: sql-login-config
           configMap:
diff --git a/components/hydra-sql/resources/hydra-sql-service.yaml b/components/hydra-sql/resources/hydra-sql-service.yaml
index b4073c6..41573f3 100644
--- a/components/hydra-sql/resources/hydra-sql-service.yaml
+++ b/components/hydra-sql/resources/hydra-sql-service.yaml
@@ -6,8 +6,9 @@ metadata:
   name: hydra-sql
 spec:
   ports:
-  - name: hydra-sql
+  - name: sql-http-port
     port: 8080
+    targetPort: sql-http-port
   selector:
     app.kubernetes.io/name: hydra-sql
 status:
diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
index 1bbdf80..7350949 100644
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
+++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
@@ -52,9 +52,9 @@ spec:
           runAsNonRoot: true
           runAsGroup: 1000
           runAsUser: 1000
-      - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
+      - name: hydra-dispatcher-caddy
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
         imagePullPolicy: Always
-        name: hydra-dispatcher-caddy
         args:
           [
             "/usr/sbin/caddy",
@@ -67,14 +67,14 @@ spec:
         readinessProbe:
           httpGet:
             path: /health
-            port: 80
+            port: 8080
           initialDelaySeconds: 5
           timeoutSeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /health
-            port: 80
+            port: 8080
           initialDelaySeconds: 15
           timeoutSeconds: 5
           periodSeconds: 15
@@ -87,13 +87,14 @@ spec:
         - name: CADDY_HTTPS_PORT
           value: "8443"
         - name: CADDY_HTTP_PORT
-          value: "80"
+          value: "8080"
         - name: CADDY_DATA_FS
           value: "/tmp/caddy"
         - name: CADDY_APP_ROOT_PUBLIC
           value: "/app/public/"
         ports:
-        - containerPort: 80
+        - containerPort: 8080
+          name: disp-http-port
         resources: {}
         securityContext:
           runAsNonRoot: true
diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
index 1f8a023..3f33afd 100644
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
+++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
@@ -6,8 +6,9 @@ metadata:
   name: hydra-dispatcher
 spec:
   ports:
-    - name: http
-      port: 80
+  - name: disp-http-port
+    port: 80
+    targetPort: disp-http-port
   selector:
     app.kubernetes.io/name: hydra-dispatcher
 status: