diff --git a/postgresql.yaml b/postgresql.yaml
index fec38a7354e5e50c33f029b6039ff55f6578a744..642bbd093467f5323fa94cb98fd2fc8930289d02 100644
--- a/postgresql.yaml
+++ b/postgresql.yaml
@@ -1,49 +1,53 @@
+---
 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
-    profiles:
-        client:
-            rpms:
-                - postgresql
-        server:
-            rpms:
-                - postgresql-server
-    api:
+  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:
         rpms:
-            - postgresql
-            - postgresql-server
-    components:
+          - postgresql-server
+      client:
         rpms:
-            pg_repack:
-                rationale: pg_repack extension
-                ref: 40fb08fa9e1e5fca454c1b33e6df9a696031b08e
-                buildorder: 1
-            pgaudit:
-                rationale: pgaudit extension
-                ref: 998cf43876ca869083fa7ce3173a03af7920661d
-                buildorder: 1
-            postgres-decoderbufs:
-                rationale: postgres-decoderbufs extension
-                ref: 885acb766546c3c2d6a1136e3c842e3d529618b9
-                buildorder: 1
-            postgresql:
-                rationale: Module API.
-                ref: afc66dbe560bb13e5fe3ecf64445c4ef4c41e29a
+          - 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