diff --git a/forgejo-appset.yaml b/forgejo-appset.yaml
index 7de736d..fdbd6a2 100644
--- a/forgejo-appset.yaml
+++ b/forgejo-appset.yaml
@@ -2,6 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
   name: forgejo
+  namespace: argocd
 spec:
   goTemplate: true
   goTemplateOptions: ["missingkey=error"]
@@ -37,9 +38,9 @@ spec:
           helm:
             valueFiles:
               - $values/forgejo/forgejo-server/values.yaml
-        - repoURL: https://edp.buildth.ing/DevFW/applicationset-poc.git
+        - repoURL: https://edp.buildth.ing/DevFW-CICD/applicationset-poc.git
           targetRevision: '{{.cluster}}'
           ref: values
-        - repoURL: https://edp.buildth.ing/DevFW/applicationset-poc.git
+        - repoURL: https://edp.buildth.ing/DevFW-CICD/applicationset-poc.git
           targetRevision: '{{.cluster}}'
           path: "forgejo/forgejo-server/manifests"
\ No newline at end of file
diff --git a/forgejo/forgejo-runner.yaml b/forgejo/forgejo-runner.yaml
deleted file mode 100644
index f3044b3..0000000
--- a/forgejo/forgejo-runner.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: forgejo-runner
-  namespace: argocd
-  labels:
-    env: dev
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  syncPolicy:
-    automated:
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
-    retry:
-      limit: -1
-  destination:
-    server: "https://kubernetes.default.svc"
-  source:
-    repoURL: https://edp.buildth.ing/DevFW/applicationset-poc.git
-    targetRevision: HEAD
-    path: "forgejo/forgejo-runner"
diff --git a/forgejo/forgejo-server.yaml b/forgejo/forgejo-server.yaml
deleted file mode 100644
index 515d55a..0000000
--- a/forgejo/forgejo-server.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: forgejo-server
-  namespace: argocd
-  labels:
-    env: dev
-spec:
-  project: default
-  syncPolicy:
-    automated:
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
-    retry:
-      limit: -1
-  destination:
-    name: in-cluster
-    namespace: gitea
-  sources:
-    - repoURL: https://edp.buildth.ing/DevFW-CICD/forgejo-helm.git
-      path: .
-      # first check out the desired version (example v9.0.0): https://code.forgejo.org/forgejo-helm/forgejo-helm/src/tag/v9.0.0/Chart.yaml
-      # (note that the chart version is not the same as the forgejo application version, which is specified in the above Chart.yaml file)
-      # then use the devops pipeline and select development, forgejo and the desired version (example v9.0.0):
-      # https://edp.buildth.ing/DevFW-CICD/devops-pipelines/actions?workflow=update-helm-depends.yaml&actor=0&status=0
-      # finally update the desired version here and include "-depends", it is created by the devops pipeline. 
-      # why do we have an added "-depends" tag? it resolves rate limitings when downloading helm OCI dependencies
-      targetRevision: v12.0.0-depends
-      helm:
-        valueFiles:
-          - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/forgejo/forgejo-server/values.yaml
-    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
-      targetRevision: HEAD
-      ref: values
-    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
-      targetRevision: HEAD
-      path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/forgejo/forgejo-server/manifests"
\ No newline at end of file
diff --git a/forgejo/forgejo-server/values.yaml b/forgejo/forgejo-server/values.yaml
index 9b4332c..93d086f 100644
--- a/forgejo/forgejo-server/values.yaml
+++ b/forgejo/forgejo-server/values.yaml
@@ -17,8 +17,6 @@ postgresql-ha:
 persistence:
   enabled: true
   size: 200Gi
-  annotations:
-    everest.io/crypt-key-id: {{{ .Env.PVC_KMS_KEY_ID }}}
 
 test:
   enabled: false