diff --git a/docker-jans-persistence-loader/scripts/spanner_setup.py b/docker-jans-persistence-loader/scripts/spanner_setup.py
index 0569db7205e..51e7c22419f 100644
--- a/docker-jans-persistence-loader/scripts/spanner_setup.py
+++ b/docker-jans-persistence-loader/scripts/spanner_setup.py
@@ -46,6 +46,9 @@ def get_data_type(self, attr, table=None):
 
             type_ = type_def.get(self.client.dialect)
 
+            if not type_:
+                continue
+
             if table in type_.get("tables", {}):
                 type_ = type_["tables"][table]
 
diff --git a/docker-jans-persistence-loader/scripts/sql_setup.py b/docker-jans-persistence-loader/scripts/sql_setup.py
index f2abb54d6b5..f030844d4ba 100644
--- a/docker-jans-persistence-loader/scripts/sql_setup.py
+++ b/docker-jans-persistence-loader/scripts/sql_setup.py
@@ -54,6 +54,9 @@ def get_data_type(self, attr, table=None):
 
             type_ = type_def.get(self.client.dialect) or type_def["mysql"]
 
+            if not type_:
+                continue
+
             if table in type_.get("tables", {}):
                 type_ = type_["tables"][table]
 
diff --git a/docker-jans-persistence-loader/scripts/upgrade.py b/docker-jans-persistence-loader/scripts/upgrade.py
index 8f359b12f2a..870d6f4cfe8 100644
--- a/docker-jans-persistence-loader/scripts/upgrade.py
+++ b/docker-jans-persistence-loader/scripts/upgrade.py
@@ -369,9 +369,10 @@ def update_scripts_entries(self):
             else:
                 props = agama_entry.attrs["jansConfProperty"]
 
-            if self.backend.type != "couchbase":
-                # try converting to mapping
-                props = [json.loads(prop) for prop in props]
+            if not isinstance(props, list):
+                props = [props]
+
+            props = [json.loads(prop) for prop in props]
 
             # filter out unwanted properties
             new_props = [
@@ -380,8 +381,7 @@ def update_scripts_entries(self):
             ]
 
             if new_props != props:
-                if self.backend.type != "couchbase":
-                    new_props = [json.dumps(prop) for prop in new_props]
+                new_props = [json.dumps(prop) for prop in new_props]
 
                 if self.backend.type == "sql" and self.backend.client.dialect == "mysql":
                     agama_entry.attrs["jansConfProperty"]["v"] = new_props