diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 79262bc83..68944fca0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,14 @@ opitzconsulting.ansible_oracle Release Notes
 .. contents:: Topics
 
 
+v3.5.1
+======
+
+Bugfixes
+--------
+
+- oradb_manage_tablespace: added missing defaults for password (oravirt#323)
+
 v3.5.0
 ======
 
diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
index b2923d8f7..d53a4ef7a 100644
--- a/changelogs/.plugin-cache.yaml
+++ b/changelogs/.plugin-cache.yaml
@@ -14,4 +14,4 @@ plugins:
   shell: {}
   strategy: {}
   vars: {}
-version: 3.5.0
+version: 3.5.1
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index ff5826ffa..1ec4c290b 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -245,3 +245,10 @@ releases:
     - pam_limits_config.yml
     - release-info.yml
     release_date: '2023-02-02'
+  3.5.1:
+    changes:
+      bugfixes:
+      - 'oradb_manage_tablespace: added missing defaults for password (oravirt#323)'
+    fragments:
+    - tablespace.yml
+    release_date: '2023-02-16'
diff --git a/galaxy.yml b/galaxy.yml
index ed174e67c..d9ecaf78f 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -2,7 +2,7 @@
 namespace: opitzconsulting
 name: ansible_oracle
 description: "This is the collection of ansible-oracle from https://github.com/oravirt/ansible-oracle"
-version: 3.5.0
+version: 3.5.1
 repository: https://github.com/oravirt/ansible-oracle.git
 readme: README.md
 authors:
diff --git a/roles/oradb_manage_tablespace/defaults/main.yml b/roles/oradb_manage_tablespace/defaults/main.yml
index bdb3e1f7c..f74121675 100644
--- a/roles/oradb_manage_tablespace/defaults/main.yml
+++ b/roles/oradb_manage_tablespace/defaults/main.yml
@@ -13,6 +13,16 @@ user_pdb_password: "{% if dbpasswords is defined and dbpasswords[item.0.cdb] is
                     {%- endif%}"
 # noqa yaml
 
+db_password_cdb: "{% if dbpasswords is defined and dbpasswords[item.0.oracle_db_name] is defined and dbpasswords[item.0.oracle_db_name][db_user] is defined %}{{ dbpasswords[item.0.oracle_db_name][db_user] }}
+                  {%- else %}{{ default_dbpass }}
+                  {%- endif %}"
+# noqa yaml
+
+db_password_pdb: "{% if dbpasswords is defined and dbpasswords[item.0.cdb] is defined and dbpasswords[item.0.cdb][db_user] is defined %}{{ dbpasswords[item.0.cdb][db_user] }}
+                  {%- else %}{{ default_dbpass }}
+                  {%- endif%}"
+# noqa yaml
+
 db_service_name: "{% if item.0 is defined %}
                     {%- if item.0.oracle_db_unique_name is defined %}{{ item.0.oracle_db_unique_name }}
                     {%- elif item.0.oracle_db_instance_name is defined %}{{ item.0.oracle_db_instance_name }}