diff --git a/infrastructure/forgejo/deployment.yaml b/infrastructure/forgejo/deployment.yaml
deleted file mode 100644
index 599216e..0000000
--- a/infrastructure/forgejo/deployment.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: forgejo
-  namespace: forgejo
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: forgejo
-  template:
-    metadata:
-      labels:
-        app: forgejo
-    spec:
-      containers:
-        - name: forgejo
-          image: forgejo/forgejo:latest
-          ports:
-            - containerPort: 3000
-            - containerPort: 22
-          volumeMounts:
-            - name: forgejo-data
-              mountPath: /data
-      volumes:
-        - name: forgejo-data
-          persistentVolumeClaim:
-            claimName: forgejo-data
diff --git a/infrastructure/forgejo/ingress.yaml b/infrastructure/forgejo/ingress.yaml
deleted file mode 100644
index 65859aa..0000000
--- a/infrastructure/forgejo/ingress.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: forgejo
-  namespace: forgejo
-  annotations:
-    kubernetes.io/ingress.class: "traefik"
-spec:
-  rules:
-    - host: forgejo.local
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: forgejo
-                port:
-                  number: 80
diff --git a/infrastructure/forgejo/pvc.yaml b/infrastructure/forgejo/pvc.yaml
deleted file mode 100644
index edcb3b8..0000000
--- a/infrastructure/forgejo/pvc.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: forgejo-data
-  namespace: forgejo
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 10Gi
-  storageClassName: longhorn
diff --git a/infrastructure/forgejo/service.yaml b/infrastructure/forgejo/service.yaml
deleted file mode 100644
index d00a17a..0000000
--- a/infrastructure/forgejo/service.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: forgejo
-  namespace: forgejo
-spec:
-  selector:
-    app: forgejo
-  ports:
-    - name: http
-      protocol: TCP
-      port: 80
-      targetPort: 3000
-    - name: ssh
-      protocol: TCP
-      port: 22
-      targetPort: 22
-  type: ClusterIP
diff --git a/infrastructure/gitea/helmrelease.yaml b/infrastructure/gitea/helmrelease.yaml
new file mode 100644
index 0000000..0ef6883
--- /dev/null
+++ b/infrastructure/gitea/helmrelease.yaml
@@ -0,0 +1,41 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: gitea
+  namespace: gitea
+spec:
+  releaseName: gitea
+  interval: 10m
+  chart:
+    spec:
+      chart: gitea
+      version: "10.x.x" # aktuelle Chart-Version prüfen!
+      sourceRef:
+        kind: HelmRepository
+        name: gitea-charts
+        namespace: flux-system
+  values:
+    persistence:
+      enabled: true
+      storageClass: longhorn
+      size: 10Gi
+    ingress:
+      enabled: true
+      className: traefik
+      hosts:
+        - host: gitea.local
+          paths:
+            - path: /
+              pathType: Prefix
+    service:
+      http:
+        type: ClusterIP
+        port: 3000
+      ssh:
+        type: ClusterIP
+        port: 22
+    gitea:
+      admin:
+        username: giteaadmin
+        password: changeme
+        email: patrykhegenberg@gmail.com
diff --git a/infrastructure/gitea/helmrepository.yaml b/infrastructure/gitea/helmrepository.yaml
new file mode 100644
index 0000000..b2cd23f
--- /dev/null
+++ b/infrastructure/gitea/helmrepository.yaml
@@ -0,0 +1,8 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: gitea-charts
+  namespace: flux-system
+spec:
+  url: https://dl.gitea.io/charts/
+  interval: 10m
diff --git a/infrastructure/forgejo/kustomization.yaml b/infrastructure/gitea/kustomization.yaml
similarity index 58%
rename from infrastructure/forgejo/kustomization.yaml
rename to infrastructure/gitea/kustomization.yaml
index 3245c70..b4a3d7c 100644
--- a/infrastructure/forgejo/kustomization.yaml
+++ b/infrastructure/gitea/kustomization.yaml
@@ -2,7 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - namespace.yaml
-  - pvc.yaml
-  - deployment.yaml
-  - service.yaml
-  - ingress.yaml
+  - helmrepository.yaml
+  - helmrelease.yaml
diff --git a/infrastructure/forgejo/namespace.yaml b/infrastructure/gitea/namespace.yaml
similarity index 71%
rename from infrastructure/forgejo/namespace.yaml
rename to infrastructure/gitea/namespace.yaml
index 6521f89..09a988f 100644
--- a/infrastructure/forgejo/namespace.yaml
+++ b/infrastructure/gitea/namespace.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: forgejo
+  name: gitea
diff --git a/infrastructure/kustomization.yaml b/infrastructure/kustomization.yaml
index 1d5b6e5..9c02278 100644
--- a/infrastructure/kustomization.yaml
+++ b/infrastructure/kustomization.yaml
@@ -3,4 +3,4 @@ kind: Kustomization
 resources:
   - monitoring/
   - longhorn/
-  - forgejo/
+  - gitea/