diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot/argocd-apps-gitea-sonarqube-bot-app.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot-staging/argocd-apps-gitea-sonarqube-bot-staging-app.yaml
similarity index 88%
rename from clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot/argocd-apps-gitea-sonarqube-bot-app.yaml
rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot-staging/argocd-apps-gitea-sonarqube-bot-staging-app.yaml
index 9276a51..534e578 100644
--- a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot/argocd-apps-gitea-sonarqube-bot-app.yaml
+++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot-staging/argocd-apps-gitea-sonarqube-bot-staging-app.yaml
@@ -2,12 +2,12 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: gitea-sonarqube-bot
+  name: gitea-sonarqube-bot-staging
   namespace: argocd
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-  project: gitea-sonarqube-bot
+  project: gitea-sonarqube-bot-staging
   destination:
     server: https://kubernetes.default.svc
     namespace: avroid-staging
@@ -20,7 +20,7 @@ spec:
       targetRevision: v0.3.4
       helm:
         valueFiles:
-          - $values/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot/values-ovveride.yaml
+          - $values/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot-staging/values-ovveride.yaml
   syncPolicy:
     automated:
       prune: true
@@ -32,7 +32,7 @@ spec:
 apiVersion: argoproj.io/v1alpha1
 kind: AppProject
 metadata:
-  name: gitea-sonarqube-bot
+  name: gitea-sonarqube-bot-staging
   namespace: argocd
   # Finalizer that ensures that project is not deleted until it is not referenced by any application
   finalizers:
diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot/argocd-apps-gitea-sonarqube-bot-network-policy.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot-staging/argocd-apps-gitea-sonarqube-bot-staging-network-policy.yaml
similarity index 80%
rename from clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot/argocd-apps-gitea-sonarqube-bot-network-policy.yaml
rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot-staging/argocd-apps-gitea-sonarqube-bot-staging-network-policy.yaml
index ce68dbf..befd907 100644
--- a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot/argocd-apps-gitea-sonarqube-bot-network-policy.yaml
+++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot-staging/argocd-apps-gitea-sonarqube-bot-staging-network-policy.yaml
@@ -2,14 +2,14 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: gitea-sonarqube-bot-in
+  name: gitea-sonarqube-bot-staging-in
   namespace: avroid-staging
   labels:
     app.kubernetes.io/managed-by: argocd
 spec:
   podSelector:
     matchLabels:
-      app.kubernetes.io/name: gitea-sonarqube-bot
+      app.kubernetes.io/name: gitea-sonarqube-bot-staging
   policyTypes:
     - Ingress
   ingress:
@@ -24,14 +24,14 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: gitea-sonarqube-bot-out
+  name: gitea-sonarqube-bot-staging-out
   namespace: avroid-staging
   labels:
     app.kubernetes.io/managed-by: argocd
 spec:
   podSelector:
     matchLabels:
-      app.kubernetes.io/name: gitea-sonarqube-bot
+      app.kubernetes.io/name: gitea-sonarqube-bot-staging
   policyTypes:
     - Egress
   ingress: []
diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot/values-ovveride.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot-staging/values-ovveride.yaml
similarity index 100%
rename from clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot/values-ovveride.yaml
rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-staging/security/gitea-sonarqube-bot-staging/values-ovveride.yaml