diff --git a/README.md b/README.md
index e054e25..963bc3a 100644
--- a/README.md
+++ b/README.md
@@ -810,7 +810,7 @@ Here's an examplary `values.yml` definition which makes use of a digest:
 
 ```yaml
 image:
-  registry: codeberg.org
+  registry: code.forgejo.org
   repository: forgejo/forgejo
   tag: 1.20.2-0
   digest: sha256:f597c14a403c2fdee9a62dae8bae29d6442f7b2cc85872cc9bb535a24cb1630e
@@ -827,7 +827,7 @@ To comply with the Forgejo helm chart definition of the digest parameter, a "cus
     "fileMatch": ["values\\.ya?ml"],
     "matchStrings": ["(?<depName>forgejo\\/forgejo)\\n(?<indentation>\\s+)tag: (?<currentValue>[^@].*?)\\n\\s+digest: (?<currentDigest>sha256:[a-f0-9]+)"],
     "datasourceTemplate": "docker",
-    "packageNameTemplate": "codeberg.org/{{depName}}",
+    "packageNameTemplate": "code.forgejo.org/{{depName}}",
     "autoReplaceStringTemplate": "{{depName}}\n{{indentation}}tag: {{newValue}}\n{{indentation}}digest: {{#if newDigest}}{{{newDigest}}}{{else}}{{{currentDigest}}}{{/if}}"
   }
 ]
@@ -856,16 +856,16 @@ To comply with the Forgejo helm chart definition of the digest parameter, a "cus
 
 ### Image
 
-| Name                 | Description                                                                                                                                                      | Value             |
-| -------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------- |
-| `image.registry`     | image registry, e.g. gcr.io,docker.io                                                                                                                            | `codeberg.org`    |
-| `image.repository`   | Image to start for this pod                                                                                                                                      | `forgejo/forgejo` |
-| `image.tag`          | Visit: [Image tag](https://codeberg.org/forgejo/-/packages/container/forgejo/versions). Defaults to `appVersion` within Chart.yaml.                              | `""`              |
-| `image.digest`       | Image digest. Allows to pin the given image tag. Useful for having control over mutable tags like `latest`                                                       | `""`              |
-| `image.pullPolicy`   | Image pull policy                                                                                                                                                | `IfNotPresent`    |
-| `image.rootless`     | Wether or not to pull the rootless version of Forgejo                                                                                                            | `true`            |
-| `image.fullOverride` | Completely overrides the image registry, path/image, tag and digest. **Adjust `image.rootless` accordingly and review [Rootless defaults](#rootless-defaults).** | `""`              |
-| `imagePullSecrets`   | Secret to use for pulling the image                                                                                                                              | `[]`              |
+| Name                 | Description                                                                                                                                                      | Value              |
+| -------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
+| `image.registry`     | image registry, e.g. gcr.io,docker.io                                                                                                                            | `code.forgejo.org` |
+| `image.repository`   | Image to start for this pod                                                                                                                                      | `forgejo/forgejo`  |
+| `image.tag`          | Visit: [Image tag](https://code.forgejo.org/forgejo/-/packages/container/forgejo/versions). Defaults to `appVersion` within Chart.yaml.                          | `""`               |
+| `image.digest`       | Image digest. Allows to pin the given image tag. Useful for having control over mutable tags like `latest`                                                       | `""`               |
+| `image.pullPolicy`   | Image pull policy                                                                                                                                                | `IfNotPresent`     |
+| `image.rootless`     | Wether or not to pull the rootless version of Forgejo                                                                                                            | `true`             |
+| `image.fullOverride` | Completely overrides the image registry, path/image, tag and digest. **Adjust `image.rootless` accordingly and review [Rootless defaults](#rootless-defaults).** | `""`               |
+| `imagePullSecrets`   | Secret to use for pulling the image                                                                                                                              | `[]`               |
 
 ### Security
 
diff --git a/ci/dev-values.yml b/ci/dev-values.yml
index 9e45329..2747d7c 100644
--- a/ci/dev-values.yml
+++ b/ci/dev-values.yml
@@ -1,3 +1,7 @@
+# Test codeberg.org image
+image:
+  registry: codeberg.org
+
 redis-cluster:
   enabled: false
 postgresql:
diff --git a/package.json b/package.json
index 9dd17d1..9b6e01b 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
     "prettier": "prettier --check --ignore-unknown --cache '**/*.*'",
     "prettier-fix": "prettier --write --ignore-unknown --cache '**/*.*'",
     "readme:lint": "markdownlint *.md -f",
-    "readme:parameters": "readme-generator -v values.yaml -r README.md"
+    "readme:parameters": "readme-generator -v values.yaml -r README.md",
+    "test": "helm unittest --strict -f 'unittests/**/*.yaml' -f 'unittests/dependency-major-image-check.yaml' ./"
   },
   "devDependencies": {
     "@bitnami/readme-generator-for-helm": "2.6.1",
diff --git a/renovate.json b/renovate.json
index 8ff496d..d6ab87a 100644
--- a/renovate.json
+++ b/renovate.json
@@ -108,7 +108,7 @@
       "fileMatch": ["^Chart\\.yaml$"],
       "matchStrings": ["appVersion: (?<currentValue>.+?)\\s"],
       "depNameTemplate": "forgejo",
-      "packageNameTemplate": "codeberg.org/forgejo/forgejo",
+      "packageNameTemplate": "code.forgejo.org/forgejo/forgejo",
       "datasourceTemplate": "docker"
     },
     {
diff --git a/unittests/deployment/image-configuration.yaml b/unittests/deployment/image-configuration.yaml
index 9d15f54..9370b88 100644
--- a/unittests/deployment/image-configuration.yaml
+++ b/unittests/deployment/image-configuration.yaml
@@ -14,7 +14,7 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: 'codeberg.org/forgejo/forgejo:1.19.3-rootless'
+          value: 'code.forgejo.org/forgejo/forgejo:1.19.3-rootless'
   - it: tag override
     template: templates/gitea/deployment.yaml
     set:
@@ -22,7 +22,7 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: 'codeberg.org/forgejo/forgejo:1.19.4-rootless'
+          value: 'code.forgejo.org/forgejo/forgejo:1.19.4-rootless'
   - it: root-based image
     template: templates/gitea/deployment.yaml
     set:
@@ -30,7 +30,7 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: 'codeberg.org/forgejo/forgejo:1.19.3'
+          value: 'code.forgejo.org/forgejo/forgejo:1.19.3'
   - it: scoped registry
     template: templates/gitea/deployment.yaml
     set:
@@ -56,7 +56,7 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: 'codeberg.org/forgejo/forgejo:1.19.3-rootless@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a'
+          value: 'code.forgejo.org/forgejo/forgejo:1.19.3-rootless@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a'
   - it: image fullOverride (does not append rootless)
     template: templates/gitea/deployment.yaml
     set:
@@ -81,7 +81,7 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: 'codeberg.org/forgejo/forgejo:1.19.3@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a'
+          value: 'code.forgejo.org/forgejo/forgejo:1.19.3@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a'
   - it: digest and global registry
     template: templates/gitea/deployment.yaml
     set:
@@ -98,13 +98,13 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.initContainers[0].image
-          value: 'codeberg.org/forgejo/forgejo:1.21-rootless'
+          value: 'code.forgejo.org/forgejo/forgejo:1.21-rootless'
       - equal:
           path: spec.template.spec.initContainers[1].image
-          value: 'codeberg.org/forgejo/forgejo:1.21-rootless'
+          value: 'code.forgejo.org/forgejo/forgejo:1.21-rootless'
       - equal:
           path: spec.template.spec.initContainers[2].image
-          value: 'codeberg.org/forgejo/forgejo:1.21-rootless'
+          value: 'code.forgejo.org/forgejo/forgejo:1.21-rootless'
       - equal:
           path: spec.template.spec.containers[0].image
-          value: 'codeberg.org/forgejo/forgejo:1.21-rootless'
+          value: 'code.forgejo.org/forgejo/forgejo:1.21-rootless'
diff --git a/values.yaml b/values.yaml
index 2e1dde0..058eb70 100644
--- a/values.yaml
+++ b/values.yaml
@@ -39,13 +39,13 @@ clusterDomain: cluster.local
 ## @section Image
 ## @param image.registry image registry, e.g. gcr.io,docker.io
 ## @param image.repository Image to start for this pod
-## @param image.tag Visit: [Image tag](https://codeberg.org/forgejo/-/packages/container/forgejo/versions). Defaults to `appVersion` within Chart.yaml.
+## @param image.tag Visit: [Image tag](https://code.forgejo.org/forgejo/-/packages/container/forgejo/versions). Defaults to `appVersion` within Chart.yaml.
 ## @param image.digest Image digest. Allows to pin the given image tag. Useful for having control over mutable tags like `latest`
 ## @param image.pullPolicy Image pull policy
 ## @param image.rootless Wether or not to pull the rootless version of Forgejo
 ## @param image.fullOverride Completely overrides the image registry, path/image, tag and digest. **Adjust `image.rootless` accordingly and review [Rootless defaults](#rootless-defaults).**
 image:
-  registry: codeberg.org
+  registry: code.forgejo.org
   repository: forgejo/forgejo
   # Overrides the image tag whose default is the chart appVersion.
   tag: ''