diff --git a/meta/main.yml b/meta/main.yml
index 5dd12c2..646f173 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -6,6 +6,8 @@
 
 galaxy_info:
   role_name: postgresql
+  namespace: onf
+
   author: Open Networking Foundation
   description: PostgreSQL Database Server
   company: Open Networking Foundation
@@ -14,12 +16,15 @@
 
   license: Apache-2.0
 
-  min_ansible_version: 2.9.5
+  min_ansible_version: 2.10.17
 
   platforms:
-    - name: Ubuntu
+    - name: ubuntu
       versions:
-        - "18.04"
+        - bionic
+    - name: Debian
+      versions:
+        - bullseye
 
   galaxy_tags:
     - postgresql
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index bb7890d..406575d 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -14,8 +14,8 @@
     privileged: true
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - name: "debian-10-priv"
-    image: "quay.io/paulfantom/molecule-systemd:debian-10"
+  - name: "debian-11-priv"
+    image: "onfinfra/molecule-systemd:debian-11"
     privileged: true
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
@@ -25,7 +25,7 @@
     prepare: prepare.yml
   inventory:
     host_vars:
-      debian-10-priv:
+      debian-11-priv:
         ansible_python_interpreter: /usr/bin/python3
 verifier:
   name: ansible