diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 2b87977eabbb896e32f388b4433dad516d257966..6bdf26c8cb1f6d207c388f9769442e213f3c6cd9 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -37,17 +37,17 @@ data:
     rpms:
       postgresql:
         rationale: Module API.
-        ref: stream-12-rhel-8.6.0
+        ref: stream-postgresql-12-rhel-8.9.0
         buildorder: 0
       pgaudit:
         rationale: pgaudit extension
-        ref: stream-12-rhel-8.6.0
+        ref: stream-postgresql-12-rhel-8.9.0
         buildorder: 1
       postgres-decoderbufs:
         rationale: postgres-decoderbufs extension
-        ref: stream-12-rhel-8.6.0
+        ref: stream-postgresql-12-rhel-8.9.0
         buildorder: 1
       pg_repack:
         rationale: pg_repack extension
-        ref: stream-12-rhel-8.6.0
+        ref: stream-postgresql-12-rhel-8.9.0
         buildorder: 1
diff --git a/postgresql.yaml b/postgresql.yaml
index 642bbd093467f5323fa94cb98fd2fc8930289d02..4b6aca1726255e2e21485d4c406fc0b955610999 100644
--- a/postgresql.yaml
+++ b/postgresql.yaml
@@ -1,53 +1,49 @@
----
 document: modulemd
 version: 2
 data:
-  name: postgresql
-  stream: 12
-  summary: PostgreSQL server and client module
-  description: PostgreSQL is an advanced Object-Relational database management
-               system (DBMS). The postgresql-server package contains the
-               programs needed to create and run a PostgreSQL server, which
-               will in turn allow you to create and maintain PostgreSQL
-               databases. The base postgresql package contains the client
-               programs that you'll need to access a PostgreSQL DBMS server.
-  license:
-    module: [MIT]
-  dependencies:
-    - buildrequires:
-        platform: [el8]
-      requires:
-        platform: [el8]
-  references:
-    community: https://www.postgresql.org
-    documentation: https://www.postgresql.org/docs/12/index.html
-    tracker: http://bugzilla.redhat.com
-  api:
-    rpms:
-      - postgresql
-      - postgresql-server
-  profiles:
-      server:
+    name: postgresql
+    stream: "12"
+    summary: PostgreSQL server and client module
+    description: PostgreSQL is an advanced Object-Relational database management system (DBMS). The postgresql-server package contains the programs needed to create and run a PostgreSQL server, which will in turn allow you to create and maintain PostgreSQL databases. The base postgresql package contains the client programs that you'll need to access a PostgreSQL DBMS server.
+    license:
+        module:
+            - MIT
+    dependencies:
+        - buildrequires:
+            platform:
+                - el8
+          requires:
+            platform:
+                - el8
+    references:
+        community: https://www.postgresql.org
+        documentation: https://www.postgresql.org/docs/12/index.html
+        tracker: http://bugzilla.redhat.com
+    profiles:
+        client:
+            rpms:
+                - postgresql
+        server:
+            rpms:
+                - postgresql-server
+    api:
         rpms:
-          - postgresql-server
-      client:
+            - postgresql
+            - postgresql-server
+    components:
         rpms:
-          - postgresql
-  components:
-    rpms:
-      postgresql:
-        rationale: Module API.
-        ref: r8s-stream-12
-        buildorder: 0
-      pgaudit:
-        rationale: pgaudit extension
-        ref: r8s-stream-12
-        buildorder: 1
-      postgres-decoderbufs:
-        rationale: postgres-decoderbufs extension
-        ref: r8s-stream-12
-        buildorder: 1
-      pg_repack:
-        rationale: pg_repack extension
-        ref: r8s-stream-12
-        buildorder: 1
+            pg_repack:
+                rationale: pg_repack extension
+                ref: r8s-stream-12
+                buildorder: 1
+            pgaudit:
+                rationale: pgaudit extension
+                ref: r8s-stream-12
+                buildorder: 1
+            postgres-decoderbufs:
+                rationale: postgres-decoderbufs extension
+                ref: r8s-stream-12
+                buildorder: 1
+            postgresql:
+                rationale: Module API.
+                ref: r8s-stream-12