diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index bdfb0dd..88b16ac 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,6 +1,9 @@
+---
 document: modulemd
 version: 2
 data:
+  name: postgresql
+  stream: 9.6
   summary: PostgreSQL server and client module
   description: PostgreSQL is an advanced Object-Relational database management
                system (DBMS). The postgresql-server package contains the
@@ -34,4 +37,4 @@ data:
     rpms:
       postgresql:
         rationale: Module API.
-        ref: stream-9.6
+        ref: stream-9.6-rhel-8.3.0
diff --git a/postgresql.yaml b/postgresql.yaml
deleted file mode 100644
index 5d53ebe..0000000
--- a/postgresql.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-document: modulemd
-version: 2
-data:
-  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.0.0
-    requires:
-      platform:
-      - el8
-  references:
-    community: https://www.postgresql.org
-    documentation: https://www.postgresql.org/docs/10/index.html
-    tracker: http://bugzilla.redhat.com
-  api:
-    rpms:
-    - postgresql
-    - postgresql-server
-  profiles:
-    server:
-      rpms:
-      - postgresql-server
-    client:
-      rpms:
-      - postgresql
-  components:
-    rpms:
-      postgresql:
-        rationale: Module API.
-        ref: 50f031942ee1b3d54b05f2c5e12bd2aebb43f15a
-  name: postgresql
-  stream: '9.6'