diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml
index 7631e72..25e5eed 100644
--- a/.github/workflows/CD.yaml
+++ b/.github/workflows/CD.yaml
@@ -60,6 +60,10 @@ jobs:
             cluster: aks-beta-fint-2021-11-23
           - org: ofk-no
             cluster: aks-api-fint-2022-02-08
+          - org: afk-no
+            cluster: aks-api-fint-2022-02-08
+          - org: bfk-no
+            cluster: aks-api-fint-2022-02-08
 
     steps:
       - name: Checkout repository
diff --git a/kustomize/base/flais.yaml b/kustomize/base/flais.yaml
index 650e52f..4cce75c 100644
--- a/kustomize/base/flais.yaml
+++ b/kustomize/base/flais.yaml
@@ -29,6 +29,9 @@ spec:
       value: "https://role-catalog.vigoiks.no/vigo/kontroll/user"
     - name: fint.kontroll.authorization.authorized-org-id
       value: "vigo.no"
+    - name: spring.kafka.consumer.group-id
+      value: 'fint-kontroll-user-catalog'
+
   envFrom:
     - configMapRef:
         name: fint-environment
diff --git a/kustomize/overlays/api/afk-no/kustomization.yaml b/kustomize/overlays/api/afk-no/kustomization.yaml
new file mode 100644
index 0000000..4e3a9ff
--- /dev/null
+++ b/kustomize/overlays/api/afk-no/kustomization.yaml
@@ -0,0 +1,43 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: afk-no
+resources:
+  - ../../../base
+commonLabels:
+  app.kubernetes.io/name: fint-kontroll-user-catalog
+  app.kubernetes.io/instance: fint-kontroll-user-catalog_afk-no
+  app.kubernetes.io/version: latest
+  app.kubernetes.io/component: backend
+  app.kubernetes.io/part-of: fint-kontroll
+  fintlabs.no/team: bas
+  fintlabs.no/org-id: afk.no
+patches:
+  - patch: |-
+      - op: replace
+        path: "/spec/orgId"
+        value: "afk.no"
+      - op: replace
+        path: "/spec/env/0/value"
+        value: "https://role-catalog.vigoiks.no/vigo/kontroll/user"
+      - op: replace
+        path: "/spec/env/1/value"
+        value: "afk.no"
+      - op: replace
+        path: "/spec/env/2/value"
+        value: "afk-no-fint-kontroll-user-catalog"
+      - op: replace
+        path: "/spec/kafka/acls/0/topic"
+        value: "afk-no.kontroll.*"
+      - op: replace
+        path: "/spec/kafka/acls/1/topic"
+        value: "afk-no.kontroll.*"
+      - op: replace
+        path: "/spec/ingress/basePath"
+        value: "/afk-no/api/users"
+      - op: replace
+        path: "/spec/url/basePath"
+        value: "/afk-no"
+    target:
+      kind: Application
+      name: fint-kontroll-user-catalog
+
diff --git a/kustomize/overlays/api/bfk-no/kustomization.yaml b/kustomize/overlays/api/bfk-no/kustomization.yaml
new file mode 100644
index 0000000..86f9cfe
--- /dev/null
+++ b/kustomize/overlays/api/bfk-no/kustomization.yaml
@@ -0,0 +1,43 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: bfk-no
+resources:
+  - ../../../base
+commonLabels:
+  app.kubernetes.io/name: fint-kontroll-user-catalog
+  app.kubernetes.io/instance: fint-kontroll-user-catalog_bfk-no
+  app.kubernetes.io/version: latest
+  app.kubernetes.io/component: backend
+  app.kubernetes.io/part-of: fint-kontroll
+  fintlabs.no/team: bas
+  fintlabs.no/org-id: bfk.no
+patches:
+  - patch: |-
+      - op: replace
+        path: "/spec/orgId"
+        value: "bfk.no"
+      - op: replace
+        path: "/spec/env/0/value"
+        value: "https://role-catalog.vigoiks.no/vigo/kontroll/user"
+      - op: replace
+        path: "/spec/env/1/value"
+        value: "bfk.no"
+      - op: replace
+        path: "/spec/env/2/value"
+        value: "bfk-no-fint-kontroll-user-catalog"
+      - op: replace
+        path: "/spec/kafka/acls/0/topic"
+        value: "bfk-no.kontroll.*"
+      - op: replace
+        path: "/spec/kafka/acls/1/topic"
+        value: "bfk-no.kontroll.*"
+      - op: replace
+        path: "/spec/ingress/basePath"
+        value: "/bfk-no/api/users"
+      - op: replace
+        path: "/spec/url/basePath"
+        value: "/bfk-no"
+    target:
+      kind: Application
+      name: fint-kontroll-user-catalog
+