diff --git a/README.md b/README.md
index 626a136..429bb78 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ Popular applications, build on top of the [Frank!Framework](https://frankframewo
 
 ## Available charts:
 
-* [frank-framework](/charts/frank-framework/README.md)
-* [frank2example](/charts/frank-framework/README.md)
-* [ff-test](/charts/frank-framework/README.md)
+* [frankframework](/charts/frankframework/README.md)
+* [frank2example](/charts/frankframework/README.md)
+* [ff-test](/charts/frankframework/README.md)
 
 ## Usage
 
@@ -16,17 +16,17 @@ Helm's [documentation](https://helm.sh/docs) to get started.
 Once Helm has been set up correctly, add the repo as follows:
 
 ```shell
-helm repo add ibissource https://ibissource.github.io/charts
+helm repo add frankframework https://frankframework.github.io/charts
 ```
 
 If you had already added this repo earlier, run `helm repo update` to retrieve
 the latest versions of the packages.  You can then run `helm search repo
-ibissource` to see the charts.
+frankframework` to see the charts.
 
 To install a chart:
 
 ```shell
-helm install <unique-name> ibissource/<chart>
+helm install <unique-name> frankframework/<chart>
 ```
 
 To uninstall the chart:
@@ -39,4 +39,4 @@ helm delete <unique-name>
 
 The Franks! are based on the "ff-common" library chart. This is done to ensure each chart can be kept up to date easily. 
 
-If you want to create a Frank! chart yourself, please refer to the [ff-common documentation](/charts/frank-framework/README.md). There is also a [Frank! template](/ff-template/README.md) that can be copied as a starting point.
\ No newline at end of file
+If you want to create a Frank! chart yourself, please refer to the [ff-common documentation](/charts/frankframework/README.md). There is also a [Frank! template](/ff-template/README.md) that can be copied as a starting point.
\ No newline at end of file
diff --git a/charts/ff-common/Chart.yaml b/charts/ff-common/Chart.yaml
index 411e42c..43e42cb 100644
--- a/charts/ff-common/Chart.yaml
+++ b/charts/ff-common/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: ff-common chart building components and helpers for the Frank!Framework
 name: ff-common
-version: 0.1.16
+version: 0.1.17
 appVersion: "7.8"
 home: https://frankframework.org
-icon: https://raw.githubusercontent.com/ibissource/charts/master/charts/ff-common/icon.svg
+icon: https://raw.githubusercontent.com/frankframework/charts/master/charts/ff-common/icon.svg
diff --git a/charts/ff-common/README.md b/charts/ff-common/README.md
index 0539931..44fa241 100644
--- a/charts/ff-common/README.md
+++ b/charts/ff-common/README.md
@@ -31,7 +31,7 @@ Whereas the sub-chart can only be used "as is", the library can be modified in y
 | Name                | Description                                                | Value                      |
 | ------------------- | ---------------------------------------------------------- | -------------------------- |
 | `image.registry`    | Frank!Framework image registry                             | `nexus.frankframework.org` |
-| `image.repository`  | Frank!Framework image repository                           | `frank-framework`          |
+| `image.repository`  | Frank!Framework image repository                           | `frankframework`           |
 | `image.tag`         | Frank!Framework image tag (immutable tags are recommended) | `""`                       |
 | `image.pullPolicy`  | Frank!Framework image pull policy                          | `IfNotPresent`             |
 | `image.pullSecrets` | Frank!Framework image pull secrets                         | `[]`                       |
diff --git a/charts/ff-common/values.schema.json b/charts/ff-common/values.schema.json
index 31e5b41..7020af3 100644
--- a/charts/ff-common/values.schema.json
+++ b/charts/ff-common/values.schema.json
@@ -23,7 +23,7 @@
                 "repository": {
                     "type": "string",
                     "description": "Frank!Framework image repository",
-                    "default": "frank-framework"
+                    "default": "frankframework"
                 },
                 "tag": {
                     "type": "string",
diff --git a/charts/ff-common/values.yaml b/charts/ff-common/values.yaml
index a095c7b..0281000 100644
--- a/charts/ff-common/values.yaml
+++ b/charts/ff-common/values.yaml
@@ -12,14 +12,14 @@ fullnameOverride: ""
 ##
 
 ## Frank!Framework image
-## ref: https://https://nexus.frankframework.org/#browse/browse:frankframework-docker:v2%2Ffrank-framework%2Ftags/
+## ref: https://https://nexus.frankframework.org/#browse/browse:frankframework-docker:v2%2Ffrankframework%2Ftags/
 ## @param image.registry Frank!Framework image registry
 ## @param image.repository Frank!Framework image repository
 ## @param image.tag Frank!Framework image tag (immutable tags are recommended)
 ##
 image:
   registry: nexus.frankframework.org
-  repository: frank-framework
+  repository: frankframework
   tag: ""
   ## @param image.pullPolicy Frank!Framework image pull policy
   ## Specify a imagePullPolicy
diff --git a/charts/ff-test/Chart.lock b/charts/ff-test/Chart.lock
index caf2a86..a879990 100644
--- a/charts/ff-test/Chart.lock
+++ b/charts/ff-test/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: ff-common
   repository: file://../ff-common
-  version: 0.1.16
-digest: sha256:2f2cfe01345e8bc408d1f4099233b5393d9cdb3ecfce2c010da6245d75a5c32b
-generated: "2023-11-09T14:14:33.445460255+01:00"
+  version: 0.1.17
+digest: sha256:353f8759953bd5fd67bd59a10d53622a7837c9cf1ac369c4d06bc221e41aadcb
+generated: "2023-11-21T10:37:23.13351162+01:00"
diff --git a/charts/ff-test/Chart.yaml b/charts/ff-test/Chart.yaml
index f324c55..464ab03 100644
--- a/charts/ff-test/Chart.yaml
+++ b/charts/ff-test/Chart.yaml
@@ -2,11 +2,11 @@ apiVersion: v2
 appVersion: "latest-tomcat"
 description: A Helm chart for testing the Frank!Framework on Kubernetes
 name: ff-test
-icon: https://raw.githubusercontent.com/ibissource/charts/master/charts/ff-test/icon.svg
+icon: https://raw.githubusercontent.com/frankframework/charts/master/charts/ff-test/icon.svg
 type: application
-version: 0.2.27
+version: 0.2.28
 
 dependencies:
   - name: ff-common
-    version: ~0.1.16
+    version: ~0.1.17
     repository: file://../ff-common
diff --git a/charts/ff-test/README.md b/charts/ff-test/README.md
index 1c78c20..b862e0e 100644
--- a/charts/ff-test/README.md
+++ b/charts/ff-test/README.md
@@ -12,17 +12,17 @@ Helm's [documentation](https://helm.sh/docs) to get started.
 Once Helm has been set up correctly, add the repo as follows:
 
 ```shell
-helm repo add ibissource https://ibissource.github.io/charts
+helm repo add frankframework https://frankframework.github.io/charts
 ```
 
 If you had already added this repo earlier, run `helm repo update` to retrieve
 the latest versions of the packages.  You can then run `helm search repo
-ibissource` to see the charts.
+frankframework` to see the charts.
 
 To install the ff-test chart:
 
 ```shell
-helm install my-ff-test ibissource/ff-test
+helm install my-ff-test frankframework/ff-test
 ```
 
 To uninstall the chart:
diff --git a/charts/ff-test/templates/configmap.context.yaml b/charts/ff-test/templates/configmap.context.yaml
index 1e7e9ae..42c7183 100644
--- a/charts/ff-test/templates/configmap.context.yaml
+++ b/charts/ff-test/templates/configmap.context.yaml
@@ -1,5 +1,5 @@
 {{/*
-This is a copy of https://github.com/ibissource/iaf/blob/master/test/src/main/webapp/META-INF/context.xml
+This is a copy of https://github.com/frankframework/iaf/blob/master/test/src/main/webapp/META-INF/context.xml
 */}}
 {{- template "ff-common.configmap.context" (list . "ff-test.configmap.context" ) -}}
 {{- define "ff-test.configmap.context" -}}
diff --git a/charts/ff-test/values.yaml b/charts/ff-test/values.yaml
index b954286..ca54f3d 100644
--- a/charts/ff-test/values.yaml
+++ b/charts/ff-test/values.yaml
@@ -12,7 +12,7 @@ fullnameOverride: ""
 ##
 
 ## Frank!Framework image
-## ref: https://https://nexus.frankframework.org/#browse/browse:frankframework-docker:v2%2Ffrank-framework%2Ftags/
+## ref: https://https://nexus.frankframework.org/#browse/browse:frankframework-docker:v2%2Ffrankframework%2Ftags/
 ## @param image.registry Frank!Framework image registry
 ## @param image.repository Frank!Framework image repository
 ## @param image.tag Frank!Framework image tag (immutable tags are recommended)
@@ -127,7 +127,7 @@ frank:
   ## @param frank.environmentVariables [object] Set extra environment variables for the Frank!
   ## @param frank.environmentVariables.jdbc.dbms.default [string] The default jdbc that will be used. This should match with one of the jdbc's in the context.xml e.g. `postgres-xe`
   ## @param frank.environmentVariables.jms.provider.default [string] The default jms that will be used. This should match with one of the jms's in the context.xml e.g. `artemis`. `frank.server.transactionManager` needs to be set.
-  ## More properties can be set. ref: https://github.com/ibissource/iaf/blob/master/test/src/main/resources/DeploymentSpecifics.properties
+  ## More properties can be set. ref: https://github.com/frankframework/iaf/blob/master/test/src/main/resources/DeploymentSpecifics.properties
   ##
   environmentVariables:
     jdbc.dbms.default: 'h2'
diff --git a/charts/frank-framework/Chart.lock b/charts/frank-framework/Chart.lock
deleted file mode 100644
index ba75081..0000000
--- a/charts/frank-framework/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: ff-common
-  repository: file://../ff-common
-  version: 0.1.16
-digest: sha256:2f2cfe01345e8bc408d1f4099233b5393d9cdb3ecfce2c010da6245d75a5c32b
-generated: "2023-11-09T11:21:00.45467104+01:00"
diff --git a/charts/frank2example/Chart.lock b/charts/frank2example/Chart.lock
index 6c3d01f..4d50840 100644
--- a/charts/frank2example/Chart.lock
+++ b/charts/frank2example/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: ff-common
   repository: file://../ff-common
-  version: 0.1.16
-digest: sha256:2f2cfe01345e8bc408d1f4099233b5393d9cdb3ecfce2c010da6245d75a5c32b
-generated: "2023-11-09T11:21:52.491374244+01:00"
+  version: 0.1.17
+digest: sha256:353f8759953bd5fd67bd59a10d53622a7837c9cf1ac369c4d06bc221e41aadcb
+generated: "2023-11-21T10:37:37.405273315+01:00"
diff --git a/charts/frank2example/Chart.yaml b/charts/frank2example/Chart.yaml
index 116a3f6..a0e6f3e 100644
--- a/charts/frank2example/Chart.yaml
+++ b/charts/frank2example/Chart.yaml
@@ -2,11 +2,11 @@ apiVersion: v2
 appVersion: "latest"
 description: A Helm chart for running Frank2Example on Kubernetes
 name: frank2example
-icon: https://raw.githubusercontent.com/ibissource/charts/master/charts/frank2example/icon.svg
+icon: https://raw.githubusercontent.com/frankframework/charts/master/charts/frank2example/icon.svg
 type: application
-version: 0.2.9
+version: 0.2.10
 
 dependencies:
   - name: ff-common
-    version: ~0.1.16
+    version: ~0.1.17
     repository: file://../ff-common
diff --git a/charts/frank2example/README.md b/charts/frank2example/README.md
index ba07899..1ff1a69 100644
--- a/charts/frank2example/README.md
+++ b/charts/frank2example/README.md
@@ -12,17 +12,17 @@ Helm's [documentation](https://helm.sh/docs) to get started.
 Once Helm has been set up correctly, add the repo as follows:
 
 ```shell
-helm repo add ibissource https://ibissource.github.io/charts
+helm repo add frankframework https://frankframework.github.io/charts
 ```
 
 If you had already added this repo earlier, run `helm repo update` to retrieve
 the latest versions of the packages.  You can then run `helm search repo
-ibissource` to see the charts.
+frankframework` to see the charts.
 
 To install the frank2example chart:
 
 ```shell
-helm install my-frank2example ibissource/frank2example
+helm install my-frank2example frankframework/frank2example
 ```
 
 To uninstall the chart:
diff --git a/charts/frank2example/values.yaml b/charts/frank2example/values.yaml
index c988434..634f137 100644
--- a/charts/frank2example/values.yaml
+++ b/charts/frank2example/values.yaml
@@ -12,7 +12,7 @@ fullnameOverride: ""
 ##
 
 ## Frank!Framework image
-## ref: https://https://nexus.frankframework.org/#browse/browse:frankframework-docker:v2%2Ffrank-framework%2Ftags/
+## ref: https://https://nexus.frankframework.org/#browse/browse:frankframework-docker:v2%2Ffrankframework%2Ftags/
 ## @param image.registry Frank!Framework image registry
 ## @param image.repository Frank!Framework image repository
 ## @param image.tag Frank!Framework image tag (immutable tags are recommended)
diff --git a/charts/frank-framework/.helmignore b/charts/frankframework/.helmignore
similarity index 100%
rename from charts/frank-framework/.helmignore
rename to charts/frankframework/.helmignore
diff --git a/charts/frankframework/Chart.lock b/charts/frankframework/Chart.lock
new file mode 100644
index 0000000..5412b95
--- /dev/null
+++ b/charts/frankframework/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: ff-common
+  repository: file://../ff-common
+  version: 0.1.17
+digest: sha256:353f8759953bd5fd67bd59a10d53622a7837c9cf1ac369c4d06bc221e41aadcb
+generated: "2023-11-21T10:37:52.443945524+01:00"
diff --git a/charts/frank-framework/Chart.yaml b/charts/frankframework/Chart.yaml
similarity index 55%
rename from charts/frank-framework/Chart.yaml
rename to charts/frankframework/Chart.yaml
index d9d655d..c9bdee2 100644
--- a/charts/frank-framework/Chart.yaml
+++ b/charts/frankframework/Chart.yaml
@@ -1,12 +1,12 @@
 apiVersion: v2
 appVersion: "7.8"
 description: A Helm chart for running the Frank!Framework on Kubernetes
-name: frank-framework
-icon: https://raw.githubusercontent.com/ibissource/charts/master/charts/frank-framework/icon.svg
+name: frankframework
+icon: https://raw.githubusercontent.com/frankframework/charts/master/charts/frankframework/icon.svg
 type: application
-version: 0.2.9
+version: 0.2.10
 
 dependencies:
   - name: ff-common
-    version: ~0.1.16
+    version: ~0.1.17
     repository: file://../ff-common
diff --git a/charts/frank-framework/README.md b/charts/frankframework/README.md
similarity index 97%
rename from charts/frank-framework/README.md
rename to charts/frankframework/README.md
index a038b8d..7a3db4e 100644
--- a/charts/frank-framework/README.md
+++ b/charts/frankframework/README.md
@@ -12,23 +12,23 @@ Helm's [documentation](https://helm.sh/docs) to get started.
 Once Helm has been set up correctly, add the repo as follows:
 
 ```shell
-helm repo add ibissource https://ibissource.github.io/charts
+helm repo add frankframework https://frankframework.github.io/charts
 ```
 
 If you had already added this repo earlier, run `helm repo update` to retrieve
 the latest versions of the packages.  You can then run `helm search repo
-ibissource` to see the charts.
+frankframework` to see the charts.
 
-To install the frank-framework chart:
+To install the frankframework chart:
 
 ```shell
-helm install my-frank-framework ibissource/frank-framework
+helm install my-frankframework frankframework/frankframework
 ```
 
 To uninstall the chart:
 
 ```shell
-helm delete my-frank-framework
+helm delete my-frankframework
 ```
 
 ## Parameters
@@ -45,7 +45,7 @@ helm delete my-frank-framework
 | Name                | Description                                                | Value                      |
 | ------------------- | ---------------------------------------------------------- | -------------------------- |
 | `image.registry`    | Frank!Framework image registry                             | `nexus.frankframework.org` |
-| `image.repository`  | Frank!Framework image repository                           | `frank-framework`          |
+| `image.repository`  | Frank!Framework image repository                           | `frankframework`           |
 | `image.tag`         | Frank!Framework image tag (immutable tags are recommended) | `""`                       |
 | `image.pullPolicy`  | Frank!Framework image pull policy                          | `IfNotPresent`             |
 | `image.pullSecrets` | Frank!Framework image pull secrets                         | `[]`                       |
@@ -156,6 +156,10 @@ For more information about DTAP stages read: https://frank-manual.readthedocs.io
 
 ## Notable changes
 
+### 0.2.10
+
+The name of the chart has been renamed (frankframework) to match the project, organisation and Docker image. 
+
 ### 0.2.8
 
 The `.Values.frank.memory` notation has been changed. It is now possible to define a minimum and a maximum, and to set percentages.
diff --git a/charts/frank-framework/icon.svg b/charts/frankframework/icon.svg
similarity index 100%
rename from charts/frank-framework/icon.svg
rename to charts/frankframework/icon.svg
diff --git a/charts/frank-framework/templates/NOTES.txt b/charts/frankframework/templates/NOTES.txt
similarity index 100%
rename from charts/frank-framework/templates/NOTES.txt
rename to charts/frankframework/templates/NOTES.txt
diff --git a/charts/frank-framework/templates/manifest.yaml b/charts/frankframework/templates/manifest.yaml
similarity index 100%
rename from charts/frank-framework/templates/manifest.yaml
rename to charts/frankframework/templates/manifest.yaml
diff --git a/charts/frank-framework/values.schema.json b/charts/frankframework/values.schema.json
similarity index 99%
rename from charts/frank-framework/values.schema.json
rename to charts/frankframework/values.schema.json
index 31e5b41..7020af3 100644
--- a/charts/frank-framework/values.schema.json
+++ b/charts/frankframework/values.schema.json
@@ -23,7 +23,7 @@
                 "repository": {
                     "type": "string",
                     "description": "Frank!Framework image repository",
-                    "default": "frank-framework"
+                    "default": "frankframework"
                 },
                 "tag": {
                     "type": "string",
diff --git a/charts/frank-framework/values.yaml b/charts/frankframework/values.yaml
similarity index 99%
rename from charts/frank-framework/values.yaml
rename to charts/frankframework/values.yaml
index a095c7b..0281000 100644
--- a/charts/frank-framework/values.yaml
+++ b/charts/frankframework/values.yaml
@@ -12,14 +12,14 @@ fullnameOverride: ""
 ##
 
 ## Frank!Framework image
-## ref: https://https://nexus.frankframework.org/#browse/browse:frankframework-docker:v2%2Ffrank-framework%2Ftags/
+## ref: https://https://nexus.frankframework.org/#browse/browse:frankframework-docker:v2%2Ffrankframework%2Ftags/
 ## @param image.registry Frank!Framework image registry
 ## @param image.repository Frank!Framework image repository
 ## @param image.tag Frank!Framework image tag (immutable tags are recommended)
 ##
 image:
   registry: nexus.frankframework.org
-  repository: frank-framework
+  repository: frankframework
   tag: ""
   ## @param image.pullPolicy Frank!Framework image pull policy
   ## Specify a imagePullPolicy
diff --git a/ff-template/Chart.lock b/ff-template/Chart.lock
index 26be388..f33c7d9 100644
--- a/ff-template/Chart.lock
+++ b/ff-template/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: ff-common
   repository: file://../charts/ff-common
-  version: 0.1.15
-digest: sha256:2556e636a35d108ffb0587f62ad241e43db2739910e93198009bc066f4c8f830
-generated: "2023-10-03T02:29:53.917635819+02:00"
+  version: 0.1.17
+digest: sha256:4225859041b2b69925615ac9392a6ac202c174d64f4c001d6a52d0d49e8d81f9
+generated: "2023-11-21T10:34:09.343662149+01:00"
diff --git a/ff-template/Chart.yaml b/ff-template/Chart.yaml
index 0d55e1b..385f963 100644
--- a/ff-template/Chart.yaml
+++ b/ff-template/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 appVersion: "7.8"
 description: A Helm chart for running a Frank! on Kubernetes
 name: ff-template
-icon: https://raw.githubusercontent.com/ibissource/charts/master/ff-template/icon.svg
+icon: https://raw.githubusercontent.com/frankframework/charts/master/ff-template/icon.svg
 type: application
-version: 0.1.5
+version: 0.1.6
 
 dependencies:
   - name: ff-common
diff --git a/ff-template/README.md b/ff-template/README.md
index ad157ec..7a94075 100644
--- a/ff-template/README.md
+++ b/ff-template/README.md
@@ -12,17 +12,17 @@ Helm's [documentation](https://helm.sh/docs) to get started.
 Once Helm has been set up correctly, add the repo as follows:
 
 ```shell
-helm repo add ibissource https://ibissource.github.io/charts
+helm repo add frankframework https://frankframework.github.io/charts
 ```
 
 If you had already added this repo earlier, run `helm repo update` to retrieve
 the latest versions of the packages.  You can then run `helm search repo
-ibissource` to see the charts.
+frankframework` to see the charts.
 
 To install the ff-template chart:
 
 ```shell
-helm install my-ff-template ibissource/ff-template
+helm install my-ff-template frankframework/ff-template
 ```
 
 To uninstall the chart:
@@ -45,7 +45,7 @@ helm delete my-ff-template
 | Name                | Description                                                | Value                      |
 | ------------------- | ---------------------------------------------------------- | -------------------------- |
 | `image.registry`    | Frank!Framework image registry                             | `nexus.frankframework.org` |
-| `image.repository`  | Frank!Framework image repository                           | `frank-framework`          |
+| `image.repository`  | Frank!Framework image repository                           | `frankframework`           |
 | `image.tag`         | Frank!Framework image tag (immutable tags are recommended) | `""`                       |
 | `image.pullPolicy`  | Frank!Framework image pull policy                          | `IfNotPresent`             |
 | `image.pullSecrets` | Frank!Framework image pull secrets                         | `[]`                       |
diff --git a/ff-template/values.schema.json b/ff-template/values.schema.json
index 31e5b41..7020af3 100644
--- a/ff-template/values.schema.json
+++ b/ff-template/values.schema.json
@@ -23,7 +23,7 @@
                 "repository": {
                     "type": "string",
                     "description": "Frank!Framework image repository",
-                    "default": "frank-framework"
+                    "default": "frankframework"
                 },
                 "tag": {
                     "type": "string",
diff --git a/ff-template/values.yaml b/ff-template/values.yaml
index a095c7b..0281000 100644
--- a/ff-template/values.yaml
+++ b/ff-template/values.yaml
@@ -12,14 +12,14 @@ fullnameOverride: ""
 ##
 
 ## Frank!Framework image
-## ref: https://https://nexus.frankframework.org/#browse/browse:frankframework-docker:v2%2Ffrank-framework%2Ftags/
+## ref: https://https://nexus.frankframework.org/#browse/browse:frankframework-docker:v2%2Ffrankframework%2Ftags/
 ## @param image.registry Frank!Framework image registry
 ## @param image.repository Frank!Framework image repository
 ## @param image.tag Frank!Framework image tag (immutable tags are recommended)
 ##
 image:
   registry: nexus.frankframework.org
-  repository: frank-framework
+  repository: frankframework
   tag: ""
   ## @param image.pullPolicy Frank!Framework image pull policy
   ## Specify a imagePullPolicy
diff --git a/frontend/nuxt.config.ts b/frontend/nuxt.config.ts
index 11f632d..1eda5e9 100644
--- a/frontend/nuxt.config.ts
+++ b/frontend/nuxt.config.ts
@@ -9,14 +9,14 @@ export default defineNuxtConfig({
       charts: {
         driver: 'github',
         prefix: '/charts',
-        repo: 'ibissource/charts',
+        repo: 'frankframework/charts',
         branch: 'master',
         dir: 'charts'
       },
       index: {
         driver: 'github',
         prefix: '/charts',
-        repo: 'ibissource/charts',
+        repo: 'frankframework/charts',
         branch: 'gh-pages',
         dir: ''
       },