diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml
index f3b9f80..1e53650 100644
--- a/.github/workflows/CD.yaml
+++ b/.github/workflows/CD.yaml
@@ -75,22 +75,10 @@ jobs:
         exclude:
           - org: fintlabs-no
             cluster: aks-api-fint-2022-02-08
-          - org: agderfk-no
-            cluster: aks-beta-fint-2021-11-23
-          - org: ffk-no
-            cluster: aks-beta-fint-2021-11-23
-          - org: innlandetfylke-no
-            cluster: aks-beta-fint-2021-11-23
           - org: mrfylke-no
             cluster: aks-beta-fint-2021-11-23
           - org: nfk-no
             cluster: aks-beta-fint-2021-11-23
-          - org: rogfk-no
-            cluster: aks-beta-fint-2021-11-23
-          - org: telemarkfylke-no
-            cluster: aks-beta-fint-2021-11-23
-          - org: vestfoldfylke-no
-            cluster: aks-beta-fint-2021-11-23
 
     steps:
       - name: Checkout repository
diff --git a/kustomize/overlays/agderfk-no/beta/kustomization.yaml b/kustomize/overlays/agderfk-no/beta/kustomization.yaml
new file mode 100644
index 0000000..967f26f
--- /dev/null
+++ b/kustomize/overlays/agderfk-no/beta/kustomization.yaml
@@ -0,0 +1,38 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: agderfk-no
+
+resources:
+  - ../../../base
+
+commonLabels:
+  app.kubernetes.io/instance: fint-flyt-history-service_agderfk_no
+  fintlabs.no/org-id: agderfk.no
+
+patches:
+  - patch: |-
+      - op: replace
+        path: "/spec/kafka/acls/0/topic"
+        value: "agderfk-no.flyt.*"
+      - op: replace
+        path: "/spec/orgId"
+        value: "agderfk.no"
+      - op: replace
+        path: "/spec/url/basePath"
+        value: "/beta/agderfk-no"
+      - op: replace
+        path: "/spec/ingress/basePath"
+        value: "/beta/agderfk-no/api/intern/historikk"
+      - op: replace
+        path: "/spec/env/1/value"
+        value: |
+          {
+            "agderfk.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"],
+            "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"],
+            "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"]
+          }
+
+    target:
+      kind: Application
+      name: fint-flyt-history-service
+
diff --git a/kustomize/overlays/ffk-no/beta/kustomization.yaml b/kustomize/overlays/ffk-no/beta/kustomization.yaml
new file mode 100644
index 0000000..6f2ead5
--- /dev/null
+++ b/kustomize/overlays/ffk-no/beta/kustomization.yaml
@@ -0,0 +1,38 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: ffk-no
+
+resources:
+  - ../../../base
+
+commonLabels:
+  app.kubernetes.io/instance: fint-flyt-history-service_ffk_no
+  fintlabs.no/org-id: ffk.no
+
+patches:
+  - patch: |-
+      - op: replace
+        path: "/spec/kafka/acls/0/topic"
+        value: "ffk-no.flyt.*"
+      - op: replace
+        path: "/spec/orgId"
+        value: "ffk.no"
+      - op: replace
+        path: "/spec/url/basePath"
+        value: "/beta/ffk-no"
+      - op: replace
+        path: "/spec/ingress/basePath"
+        value: "/beta/ffk-no/api/intern/historikk"
+      - op: replace
+        path: "/spec/env/1/value"
+        value: |
+          {
+            "ffk.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"],
+            "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"],
+            "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"]
+          }
+
+    target:
+      kind: Application
+      name: fint-flyt-history-service
+
diff --git a/kustomize/overlays/innlandetfylke-no/beta/kustomization.yaml b/kustomize/overlays/innlandetfylke-no/beta/kustomization.yaml
new file mode 100644
index 0000000..ef63234
--- /dev/null
+++ b/kustomize/overlays/innlandetfylke-no/beta/kustomization.yaml
@@ -0,0 +1,38 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: innlandetfylke-no
+
+resources:
+  - ../../../base
+
+commonLabels:
+  app.kubernetes.io/instance: fint-flyt-history-service_innlandetfylke_no
+  fintlabs.no/org-id: innlandetfylke.no
+
+patches:
+  - patch: |-
+      - op: replace
+        path: "/spec/kafka/acls/0/topic"
+        value: "innlandetfylke-no.flyt.*"
+      - op: replace
+        path: "/spec/orgId"
+        value: "innlandetfylke.no"
+      - op: replace
+        path: "/spec/url/basePath"
+        value: "/beta/innlandetfylke-no"
+      - op: replace
+        path: "/spec/ingress/basePath"
+        value: "/beta/innlandetfylke-no/api/intern/historikk"
+      - op: replace
+        path: "/spec/env/1/value"
+        value: |
+          {
+            "innlandetfylke.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"],
+            "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"],
+            "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"]
+          }
+
+    target:
+      kind: Application
+      name: fint-flyt-history-service
+
diff --git a/kustomize/overlays/rogfk-no/beta/kustomization.yaml b/kustomize/overlays/rogfk-no/beta/kustomization.yaml
new file mode 100644
index 0000000..d04c85f
--- /dev/null
+++ b/kustomize/overlays/rogfk-no/beta/kustomization.yaml
@@ -0,0 +1,38 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: rogfk-no
+
+resources:
+  - ../../../base
+
+commonLabels:
+  app.kubernetes.io/instance: fint-flyt-history-service_rogfk_no
+  fintlabs.no/org-id: rogfk.no
+
+patches:
+  - patch: |-
+      - op: replace
+        path: "/spec/kafka/acls/0/topic"
+        value: "rogfk-no.flyt.*"
+      - op: replace
+        path: "/spec/orgId"
+        value: "rogfk.no"
+      - op: replace
+        path: "/spec/url/basePath"
+        value: "/beta/rogfk-no"
+      - op: replace
+        path: "/spec/ingress/basePath"
+        value: "/beta/rogfk-no/api/intern/historikk"
+      - op: replace
+        path: "/spec/env/1/value"
+        value: |
+          {
+            "rogfk.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"],
+            "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"],
+            "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"]
+          }
+
+    target:
+      kind: Application
+      name: fint-flyt-history-service
+
diff --git a/kustomize/overlays/telemarkfylke-no/beta/kustomization.yaml b/kustomize/overlays/telemarkfylke-no/beta/kustomization.yaml
new file mode 100644
index 0000000..a25c640
--- /dev/null
+++ b/kustomize/overlays/telemarkfylke-no/beta/kustomization.yaml
@@ -0,0 +1,38 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: telemarkfylke-no
+
+resources:
+  - ../../../base
+
+commonLabels:
+  app.kubernetes.io/instance: fint-flyt-history-service_telemarkfylke_no
+  fintlabs.no/org-id: telemarkfylke.no
+
+patches:
+  - patch: |-
+      - op: replace
+        path: "/spec/kafka/acls/0/topic"
+        value: "telemarkfylke-no.flyt.*"
+      - op: replace
+        path: "/spec/orgId"
+        value: "telemarkfylke.no"
+      - op: replace
+        path: "/spec/url/basePath"
+        value: "/beta/telemarkfylke-no"
+      - op: replace
+        path: "/spec/ingress/basePath"
+        value: "/beta/telemarkfylke-no/api/intern/historikk"
+      - op: replace
+        path: "/spec/env/1/value"
+        value: |
+          {
+            "telemarkfylke.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"],
+            "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"],
+            "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"]
+          }
+
+    target:
+      kind: Application
+      name: fint-flyt-history-service
+
diff --git a/kustomize/overlays/vestfoldfylke-no/beta/kustomization.yaml b/kustomize/overlays/vestfoldfylke-no/beta/kustomization.yaml
new file mode 100644
index 0000000..b1e0d58
--- /dev/null
+++ b/kustomize/overlays/vestfoldfylke-no/beta/kustomization.yaml
@@ -0,0 +1,38 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: vestfoldfylke-no
+
+resources:
+  - ../../../base
+
+commonLabels:
+  app.kubernetes.io/instance: fint-flyt-history-service_vestfoldfylke_no
+  fintlabs.no/org-id: vestfoldfylke.no
+
+patches:
+  - patch: |-
+      - op: replace
+        path: "/spec/kafka/acls/0/topic"
+        value: "vestfoldfylke-no.flyt.*"
+      - op: replace
+        path: "/spec/orgId"
+        value: "vestfoldfylke.no"
+      - op: replace
+        path: "/spec/url/basePath"
+        value: "/beta/vestfoldfylke-no"
+      - op: replace
+        path: "/spec/ingress/basePath"
+        value: "/beta/vestfoldfylke-no/api/intern/historikk"
+      - op: replace
+        path: "/spec/env/1/value"
+        value: |
+          {
+            "vestfoldfylke.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"],
+            "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"],
+            "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"]
+          }
+
+    target:
+      kind: Application
+      name: fint-flyt-history-service
+