diff --git a/charts/squadron-keel-server/Chart.yaml b/charts/squadron-keel-server/Chart.yaml
index 3b9479a..3028070 100644
--- a/charts/squadron-keel-server/Chart.yaml
+++ b/charts/squadron-keel-server/Chart.yaml
@@ -15,5 +15,5 @@ annotations:
     - name: Chart Source
       url: https://github.com/foomo/helm-charts/tree/main/charts/squadron-keel-server
 
-version: 0.2.0
-appVersion: 0.2.0
+version: 0.2.1
+appVersion: 0.2.1
diff --git a/charts/squadron-keel-server/README.md b/charts/squadron-keel-server/README.md
index ef5d952..12a5df4 100644
--- a/charts/squadron-keel-server/README.md
+++ b/charts/squadron-keel-server/README.md
@@ -1,6 +1,6 @@
 # squadron-keel-server
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.0](https://img.shields.io/badge/AppVersion-0.2.0-informational?style=flat-square)
+![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.1](https://img.shields.io/badge/AppVersion-0.2.1-informational?style=flat-square)
 
 Squadron Keel Server Chart
 
diff --git a/charts/squadron-keel-server/templates/gateway.yaml b/charts/squadron-keel-server/templates/gateway.yaml
index 3b1d0d0..51e8743 100644
--- a/charts/squadron-keel-server/templates/gateway.yaml
+++ b/charts/squadron-keel-server/templates/gateway.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Capabilities.APIVersions.Has "foomo.org/v1") .Values.gateway.enabled }}
+{{- if .Values.gateway.enabled }}
 apiVersion: foomo.org/v1
 kind: Gateway
 metadata:
diff --git a/charts/squadron-nextjs-server/Chart.yaml b/charts/squadron-nextjs-server/Chart.yaml
index fa015b2..29a1756 100644
--- a/charts/squadron-nextjs-server/Chart.yaml
+++ b/charts/squadron-nextjs-server/Chart.yaml
@@ -14,5 +14,5 @@ annotations:
     - name: Chart Source
       url: https://github.com/foomo/helm-charts/tree/main/charts/squadron-nextjs-server
 
-version: 0.1.10
-appVersion: 0.1.10
+version: 0.1.11
+appVersion: 0.1.11
diff --git a/charts/squadron-nextjs-server/README.md b/charts/squadron-nextjs-server/README.md
index bdfcc17..193591e 100644
--- a/charts/squadron-nextjs-server/README.md
+++ b/charts/squadron-nextjs-server/README.md
@@ -1,6 +1,6 @@
 # squadron-nextjs-server
 
-![Version: 0.1.10](https://img.shields.io/badge/Version-0.1.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.10](https://img.shields.io/badge/AppVersion-0.1.10-informational?style=flat-square)
+![Version: 0.1.11](https://img.shields.io/badge/Version-0.1.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.11](https://img.shields.io/badge/AppVersion-0.1.11-informational?style=flat-square)
 
 Squadron NextJS Server Chart
 
diff --git a/charts/squadron-nextjs-server/templates/gateway.yaml b/charts/squadron-nextjs-server/templates/gateway.yaml
index 5461467..901bbcc 100644
--- a/charts/squadron-nextjs-server/templates/gateway.yaml
+++ b/charts/squadron-nextjs-server/templates/gateway.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Capabilities.APIVersions.Has "foomo.org/v1") .Values.gateway.enabled }}
+{{- if .Values.gateway.enabled }}
 apiVersion: foomo.org/v1
 kind: Gateway
 metadata: