diff --git a/template/stacks/garm/garm/values.yaml b/template/stacks/garm/garm/values.yaml
index 23e25b5..4df35b5 100644
--- a/template/stacks/garm/garm/values.yaml
+++ b/template/stacks/garm/garm/values.yaml
@@ -38,7 +38,7 @@ providerConfig:
       organization: TelekomOP
   edgeConnectK8s:
     sizer:
-      sidecarImage: edp.buildth.ing/devfw-cicd/forgejo-runner-sizer-collector:0.0.4
+      sidecarImage: edp.buildth.ing/devfw-cicd/ci-sizer-collector:0.0.4
 
 garm:
   logging:
diff --git a/template/stacks/garm/sizer-receiver/deployment.yaml b/template/stacks/garm/sizer-receiver/deployment.yaml
index 3272130..6e0e000 100644
--- a/template/stacks/garm/sizer-receiver/deployment.yaml
+++ b/template/stacks/garm/sizer-receiver/deployment.yaml
@@ -20,7 +20,7 @@ spec:
         fsGroup: 65534
       containers:
         - name: receiver
-          image: edp.buildth.ing/devfw-cicd/forgejo-runner-sizer-receiver:latest
+          image: edp.buildth.ing/devfw-cicd/ci-sizer-receiver:latest
           imagePullPolicy: Always
           args:
             - --db=/data/metrics.db
@@ -51,7 +51,7 @@ spec:
             - name: RECEIVER_OIDC_ISSUER
               value: "https://dex.{{{ .Env.DOMAIN }}}"
             - name: RECEIVER_OIDC_CLIENT_ID
-              value: "forgejo-runner-sizer"
+              value: "ci-sizer"
             - name: RECEIVER_OIDC_CLIENT_SECRET
               valueFrom:
                 secretKeyRef:
@@ -62,7 +62,7 @@ spec:
             - name: RECEIVER_SESSION_TTL
               value: "12h"
             - name: RECEIVER_ALLOWED_ORG
-              value: "DevFW"
+              value: "{{{ .Env.SIZER_ALLOWED_ORG }}}"
             - name: RECEIVER_CPU_SIZING_MODE
               value: "observe"
             - name: RECEIVER_MEMORY_QOS