diff --git a/argocd-ingress/overlays/prod/argocd-ingress.yaml b/argocd-ingress/overlays/prod/argocd-ingress.yaml
new file mode 100644
index 0000000..02fa337
--- /dev/null
+++ b/argocd-ingress/overlays/prod/argocd-ingress.yaml
@@ -0,0 +1,31 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: argocd-ingress
+  namespace: argocd
+  annotations:
+    kubernetes.io/ingress.class: traefik
+    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    traefik.ingress.kubernetes.io/router.tls: "true"
+spec:
+  defaultBackend:
+    service:
+      name: argocd-server
+      port:
+        number: 8443
+  tls:
+    - hosts:
+        - argocd.drive.sunet.se 
+      secretName: tls-secret
+  
+  rules:
+  - host: argocd.drive.sunet.se
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend: 
+          service:
+            name: argocd-server
+            port:
+              number: 80
diff --git a/argocd-ingress/overlays/prod/kustomization.yaml b/argocd-ingress/overlays/prod/kustomization.yaml
new file mode 100644
index 0000000..507859f
--- /dev/null
+++ b/argocd-ingress/overlays/prod/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: 'kustomize.config.k8s.io/v1beta1'
+kind: Kustomization
+bases:
+- ../../base
+patchesStrategicMerge:
+  - argocd-ingress.yaml
diff --git a/argocd/base/argocd-namespace.yml b/argocd/base/argocd-namespace.yml
new file mode 100644
index 0000000..0eaf66b
--- /dev/null
+++ b/argocd/base/argocd-namespace.yml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: argocd
+spec:
+  finalizers:
+  - kubernetes
diff --git a/argocd/base/kustomization.yaml b/argocd/base/kustomization.yaml
new file mode 100644
index 0000000..fcc1280
--- /dev/null
+++ b/argocd/base/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: argocd
+resources:
+- https://raw.githubusercontent.com/argoproj/argo-cd/v2.5.10/manifests/ha/install.yaml
diff --git a/argocd/overlays/prod/argocd-cm.yaml b/argocd/overlays/prod/argocd-cm.yaml
new file mode 100644
index 0000000..aa097a1
--- /dev/null
+++ b/argocd/overlays/prod/argocd-cm.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/instance: argocd
+    app.kubernetes.io/name: argocd-cm
+    app.kubernetes.io/part-of: argocd
+  name: argocd-cm
+  namespace: argocd
+data:
+  resource.customizations: |
+    networking.k8s.io/Ingress:
+        health.lua: |
+          hs = {}
+          hs.status = "Healthy"
+          return hs
diff --git a/argocd/overlays/prod/argocd-server-deployment.yaml b/argocd/overlays/prod/argocd-server-deployment.yaml
new file mode 100644
index 0000000..0892277
--- /dev/null
+++ b/argocd/overlays/prod/argocd-server-deployment.yaml
@@ -0,0 +1,22 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: argocd-server
+    app.kubernetes.io/part-of: argocd
+  name: argocd-server
+  namespace: argocd
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: argocd-server
+    spec:
+      containers:
+      - name: argocd-server
+        command:
+        - argocd-server
+        - --insecure
+        - --redis
+        - "argocd-redis-ha-haproxy:6379"
diff --git a/argocd/overlays/prod/kustomization.yaml b/argocd/overlays/prod/kustomization.yaml
new file mode 100644
index 0000000..613ab33
--- /dev/null
+++ b/argocd/overlays/prod/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: 'kustomize.config.k8s.io/v1beta1'
+kind: Kustomization
+bases:
+- ../../base
+patchesStrategicMerge:
+- argocd-server-deployment.yaml
+- argocd-cm.yaml
+- argocd-ingress.yaml
diff --git a/argocd/overlays/test/argocd-cm.yaml b/argocd/overlays/test/argocd-cm.yaml
new file mode 100644
index 0000000..aa097a1
--- /dev/null
+++ b/argocd/overlays/test/argocd-cm.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/instance: argocd
+    app.kubernetes.io/name: argocd-cm
+    app.kubernetes.io/part-of: argocd
+  name: argocd-cm
+  namespace: argocd
+data:
+  resource.customizations: |
+    networking.k8s.io/Ingress:
+        health.lua: |
+          hs = {}
+          hs.status = "Healthy"
+          return hs
diff --git a/argocd/overlays/test/argocd-repo-server-deployment.yaml b/argocd/overlays/test/argocd-repo-server-deployment.yaml
new file mode 100644
index 0000000..13571ab
--- /dev/null
+++ b/argocd/overlays/test/argocd-repo-server-deployment.yaml
@@ -0,0 +1,21 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: repo-server
+    app.kubernetes.io/name: argocd-repo-server
+    app.kubernetes.io/part-of: argocd
+  name: argocd-repo-server
+  namespace: argocd
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: argocd-repo-server
+    spec:
+      containers:
+      - name: argocd-repo-server
+        env:
+        - name: ARGOCD_EXEC_TIMEOUT
+          value: "300s"
+
diff --git a/argocd/overlays/test/argocd-server-deployment.yaml b/argocd/overlays/test/argocd-server-deployment.yaml
new file mode 100644
index 0000000..be4c4c8
--- /dev/null
+++ b/argocd/overlays/test/argocd-server-deployment.yaml
@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: argocd-server
+    app.kubernetes.io/part-of: argocd
+  name: argocd-server
+  namespace: argocd
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: argocd-server
+    spec:
+      containers:
+      - name: argocd-server
+        command:
+        - argocd-server
+        - --insecure
+        - --redis
+        - "argocd-redis-ha-haproxy:6379"
+
diff --git a/argocd/overlays/test/kustomization.yaml b/argocd/overlays/test/kustomization.yaml
new file mode 100644
index 0000000..268ff77
--- /dev/null
+++ b/argocd/overlays/test/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: 'kustomize.config.k8s.io/v1beta1'
+kind: Kustomization
+bases:
+- ../../base
+patchesStrategicMerge:
+- argocd-server-deployment.yaml
+- argocd-repo-server-deployment.yaml
+- argocd-cm.yaml
diff --git a/rds-complements/base/describo-ingress.yml b/rds-complements/base/describo-ingress.yml
new file mode 100644
index 0000000..2c6a63e
--- /dev/null
+++ b/rds-complements/base/describo-ingress.yml
@@ -0,0 +1,32 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: describo-ingress
+  namespace: rds
+  annotations:
+    kubernetes.io/ingress.class: traefik
+    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    traefik.ingress.kubernetes.io/router.tls: "true"
+spec:
+  defaultBackend:
+    service:
+      name: layer0-describo
+      port:
+        number: 80
+  tls:
+    - hosts:
+        - describo.drive.test.sunet.se 
+      secretName: tls-secret
+  
+  rules:
+  - host: describo.drive.test.sunet.se
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend: 
+          service:
+            name: layer0-describo
+            port:
+              number: 80
diff --git a/rds-complements/base/doris-deployment.yml b/rds-complements/base/doris-deployment.yml
new file mode 100644
index 0000000..baa11d7
--- /dev/null
+++ b/rds-complements/base/doris-deployment.yml
@@ -0,0 +1,53 @@
+---
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: layer1-port-doris
+  namespace: rds
+  labels:
+    app: layer1-port-doris
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: layer1-port-doris
+  template:
+    metadata:
+      creationTimestamp:
+      labels:
+        app: layer1-port-doris
+    spec:
+      containers:
+      - name: doris
+        image: docker.sunet.se/rds/doris-rds:ci-RDS-Connectors-13
+        env:
+          - name: ASPNETCORE_ENVIRONMENT
+            value: Development
+          - name: ASPNETCORE_URLS
+            value: http://+:80
+          - name: Domain
+            value: sunet.se
+          - name: ScieboRds__TokenStorageUrl
+            value: http://layer3-token-storage 
+          - name: S3__Url
+            value: dummy
+          - name: ManifestIndex__Url
+            value: https://snd-storage-metadata-index-test-snd-dev.apps.k8s.gu.se
+          - name: ManifestIndex__ApiKey
+            valueFrom:
+              secretKeyRef:
+                name: doris-api-key
+                key: "api-key"
+          - name: S3__AccessKey
+            valueFrom:
+              secretKeyRef:
+                name: doris-s3-key
+                key: "s3-key"
+          - name: S3__SecretKey
+            valueFrom:
+              secretKeyRef:
+                name: doris-s3-secret
+                key: "s3-secret"
+        resources: {}
+  strategy: {}
+status: {}
diff --git a/rds-complements/base/doris-service.yaml b/rds-complements/base/doris-service.yaml
new file mode 100644
index 0000000..63a7151
--- /dev/null
+++ b/rds-complements/base/doris-service.yaml
@@ -0,0 +1,25 @@
+---
+apiVersion: v1
+items:
+- apiVersion: v1
+  kind: Service
+  metadata:
+    labels:
+      app: layer1-port-doris
+    name: layer1-port-doris
+    namespace: rds
+  spec:
+    ports:
+    - port: 80
+      protocol: TCP
+      targetPort: 80
+    selector:
+      app: layer1-port-doris
+    sessionAffinity: None
+    type: ClusterIP
+  status:
+    loadBalancer: {}
+kind: List
+metadata:
+  resourceVersion: ""
+  selfLink: ""
diff --git a/rds-complements/base/kustomization.yaml b/rds-complements/base/kustomization.yaml
new file mode 100644
index 0000000..9a26449
--- /dev/null
+++ b/rds-complements/base/kustomization.yaml
@@ -0,0 +1,5 @@
+resources:
+  - describo-ingress.yml
+  - doris-deployment.yml
+  - rds-ingress.yml
+  - sunet-service.yml
diff --git a/rds-complements/base/rds-ingress.yml b/rds-complements/base/rds-ingress.yml
new file mode 100644
index 0000000..9874468
--- /dev/null
+++ b/rds-complements/base/rds-ingress.yml
@@ -0,0 +1,32 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: rds-ingress
+  namespace: rds
+  annotations:
+    kubernetes.io/ingress.class: traefik
+    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    traefik.ingress.kubernetes.io/router.tls: "true"
+spec:
+  defaultBackend:
+    service:
+      name: layer0-web
+      port:
+        number: 80
+  tls:
+    - hosts:
+        - rds.drive.test.sunet.se 
+      secretName: tls-secret
+  
+  rules:
+  - host: rds.drive.test.sunet.se
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend: 
+          service:
+            name: layer0-web
+            port:
+              number: 80
diff --git a/rds-complements/base/sunet-service.yml b/rds-complements/base/sunet-service.yml
new file mode 100644
index 0000000..d602b5c
--- /dev/null
+++ b/rds-complements/base/sunet-service.yml
@@ -0,0 +1,11 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: sunet-drive
+  namespace: sunetrds
+spec:
+  type: ExternalName
+  externalName: sunet.drive.test.sunet.se
+  ports:
+    - port: 443
diff --git a/rds-complements/overlays/test/describo-ingress.yml b/rds-complements/overlays/test/describo-ingress.yml
new file mode 100644
index 0000000..2c6a63e
--- /dev/null
+++ b/rds-complements/overlays/test/describo-ingress.yml
@@ -0,0 +1,32 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: describo-ingress
+  namespace: rds
+  annotations:
+    kubernetes.io/ingress.class: traefik
+    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    traefik.ingress.kubernetes.io/router.tls: "true"
+spec:
+  defaultBackend:
+    service:
+      name: layer0-describo
+      port:
+        number: 80
+  tls:
+    - hosts:
+        - describo.drive.test.sunet.se 
+      secretName: tls-secret
+  
+  rules:
+  - host: describo.drive.test.sunet.se
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend: 
+          service:
+            name: layer0-describo
+            port:
+              number: 80
diff --git a/rds-complements/overlays/test/kustomization.yaml b/rds-complements/overlays/test/kustomization.yaml
new file mode 100644
index 0000000..81f5c8f
--- /dev/null
+++ b/rds-complements/overlays/test/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: 'kustomize.config.k8s.io/v1beta1'
+kind: Kustomization
+bases:
+- ../../base
+patchesStrategicMerge:
+  - describo-ingress.yml
+  - rds-ingress.yml
+  - sunet-service.yml
diff --git a/rds-complements/overlays/test/rds-ingress.yml b/rds-complements/overlays/test/rds-ingress.yml
new file mode 100644
index 0000000..9874468
--- /dev/null
+++ b/rds-complements/overlays/test/rds-ingress.yml
@@ -0,0 +1,32 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: rds-ingress
+  namespace: rds
+  annotations:
+    kubernetes.io/ingress.class: traefik
+    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    traefik.ingress.kubernetes.io/router.tls: "true"
+spec:
+  defaultBackend:
+    service:
+      name: layer0-web
+      port:
+        number: 80
+  tls:
+    - hosts:
+        - rds.drive.test.sunet.se 
+      secretName: tls-secret
+  
+  rules:
+  - host: rds.drive.test.sunet.se
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend: 
+          service:
+            name: layer0-web
+            port:
+              number: 80
diff --git a/rds-complements/overlays/test/sunet-service.yml b/rds-complements/overlays/test/sunet-service.yml
new file mode 100644
index 0000000..d602b5c
--- /dev/null
+++ b/rds-complements/overlays/test/sunet-service.yml
@@ -0,0 +1,11 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: sunet-drive
+  namespace: sunetrds
+spec:
+  type: ExternalName
+  externalName: sunet.drive.test.sunet.se
+  ports:
+    - port: 443