diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26566ad3..e6fc333e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- Added support for Superset versions `1.4.2`, `1.5.3`, `2.0.1` and `2.1.0` ([#362]).
+
 ### Changed
 
 - `operator-rs` `0.40.2` -> `0.41.0` ([#360]).
@@ -10,6 +14,7 @@
 
 [#360]: https://github.com/stackabletech/superset-operator/pull/360
 [#361]: https://github.com/stackabletech/superset-operator/pull/361
+[#362]: https://github.com/stackabletech/superset-operator/pull/362
 
 ## [23.4.0] - 2023-04-17
 
diff --git a/docs/modules/superset/examples/getting_started/superset.yaml b/docs/modules/superset/examples/getting_started/superset.yaml
index 17404410..1eda0008 100644
--- a/docs/modules/superset/examples/getting_started/superset.yaml
+++ b/docs/modules/superset/examples/getting_started/superset.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-superset
 spec:
   image:
-    productVersion: 1.5.1
+    productVersion: 2.1.0
     stackableVersion: 0.0.0-dev
   clusterConfig:
     listenerClass: external-unstable
diff --git a/docs/modules/superset/examples/getting_started/superset.yaml.j2 b/docs/modules/superset/examples/getting_started/superset.yaml.j2
index b60d65c0..675c7854 100644
--- a/docs/modules/superset/examples/getting_started/superset.yaml.j2
+++ b/docs/modules/superset/examples/getting_started/superset.yaml.j2
@@ -5,7 +5,7 @@ metadata:
   name: simple-superset
 spec:
   image:
-    productVersion: 1.5.1
+    productVersion: 2.1.0
     stackableVersion: {{ versions.superset }}
   clusterConfig:
     listenerClass: external-unstable
diff --git a/docs/modules/superset/pages/usage-guide/security.adoc b/docs/modules/superset/pages/usage-guide/security.adoc
index bdf86b74..f91007ef 100644
--- a/docs/modules/superset/pages/usage-guide/security.adoc
+++ b/docs/modules/superset/pages/usage-guide/security.adoc
@@ -19,7 +19,7 @@ metadata:
   name: superset-with-ldap-server
 spec:
   image:
-    productVersion: 1.5.1
+    productVersion: 2.1.0
     stackableVersion: 0.0.0-dev
   [...]
   authenticationConfig:
diff --git a/docs/modules/superset/partials/supported-versions.adoc b/docs/modules/superset/partials/supported-versions.adoc
index 1233bc51..0987da8e 100644
--- a/docs/modules/superset/partials/supported-versions.adoc
+++ b/docs/modules/superset/partials/supported-versions.adoc
@@ -3,5 +3,7 @@
 // Stackable Platform documentation.
 
 - 1.3.2
-- 1.4.1
-- 1.5.1
+- 1.4.1, 1.4.2
+- 1.5.1, 1.5.3
+- 2.0.1
+- 2.1.0
diff --git a/examples/superset-with-ldap.yaml b/examples/superset-with-ldap.yaml
index 6b783de5..843f2ac5 100644
--- a/examples/superset-with-ldap.yaml
+++ b/examples/superset-with-ldap.yaml
@@ -149,8 +149,10 @@ metadata:
   name: superset-with-ldap-server-veri-tls
 spec:
   image:
-    productVersion: 1.5.1
+    productVersion: 2.1.0
     stackableVersion: 0.0.0-dev
+  clusterConfig:
+    listenerClass: external-unstable
   credentialsSecret: superset-with-ldap-server-veri-tls-credentials
   nodes:
     roleGroups:
diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs
index e307b087..3434b908 100644
--- a/rust/crd/src/affinity.rs
+++ b/rust/crd/src/affinity.rs
@@ -46,8 +46,8 @@ mod tests {
           name: simple-superset
         spec:
           image:
-            productVersion: 1.5.1
-            stackableVersion: "23.1"
+            productVersion: 2.1.0
+            stackableVersion: "0.0.0-dev"
           credentialsSecret: simple-superset-credentials
           nodes:
             roleGroups:
@@ -108,8 +108,8 @@ mod tests {
           name: simple-superset
         spec:
           image:
-            productVersion: 1.5.1
-            stackableVersion: "23.1"
+            productVersion: 2.1.0
+            stackableVersion: "0.0.0-dev"
           credentialsSecret: simple-superset-credentials
           nodes:
             roleGroups:
diff --git a/rust/operator-binary/src/druid_connection_controller.rs b/rust/operator-binary/src/druid_connection_controller.rs
index 12311b95..115a7c40 100644
--- a/rust/operator-binary/src/druid_connection_controller.rs
+++ b/rust/operator-binary/src/druid_connection_controller.rs
@@ -316,6 +316,9 @@ async fn build_import_job(
         .command(vec!["/bin/sh".to_string()])
         .args(vec![String::from("-c"), commands.join("; ")])
         .add_env_var_from_secret("DATABASE_URI", secret, "connections.sqlalchemyDatabaseUri")
+        // From 2.1.0 superset barfs if the SECRET_KEY is not set properly. This causes the import job to fail.
+        // Setting the env var is enough to be picked up: https://superset.apache.org/docs/installation/configuring-superset/#configuration
+        .add_env_var_from_secret("SUPERSET_SECRET_KEY", secret, "connections.secretKey")
         .build();
 
     let pod = PodTemplateSpec {
diff --git a/tests/templates/kuttl/druid-connection/02-install-superset.yaml.j2 b/tests/templates/kuttl/druid-connection/02-install-superset.yaml.j2
index 089e0833..5e81c14d 100644
--- a/tests/templates/kuttl/druid-connection/02-install-superset.yaml.j2
+++ b/tests/templates/kuttl/druid-connection/02-install-superset.yaml.j2
@@ -32,6 +32,8 @@ spec:
 {% endif %}
   credentialsSecret: superset-credentials
   loadExamplesOnInit: false
+  clusterConfig:
+    listenerClass: external-unstable
   nodes:
     config:
       logging:
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 063ac797..706f2d3e 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -3,11 +3,13 @@ dimensions:
   - name: superset
     values:
       - 1.3.2-stackable0.0.0-dev
-      - 1.4.1-stackable0.0.0-dev
-      - 1.5.1-stackable0.0.0-dev
+      - 1.4.2-stackable0.0.0-dev
+      - 1.5.3-stackable0.0.0-dev
+      - 2.0.1-stackable0.0.0-dev
+      - 2.1.0-stackable0.0.0-dev
   - name: superset-latest
     values:
-      - 1.5.1-stackable0.0.0-dev
+      - 2.1.0-stackable0.0.0-dev
   - name: ldap-authentication
     values:
       - no-tls