diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index b297fd5..5d83745 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -37,13 +37,17 @@ data:
     rpms:
       postgresql:
         rationale: Module API.
-        ref: stream-12-rhel-8.4.0
+        ref: stream-12-rhel-8.5.0
         buildorder: 0
       pgaudit:
         rationale: pgaudit extension
-        ref: stream-12-rhel-8.4.0
+        ref: stream-12-rhel-8.5.0
         buildorder: 1
       postgres-decoderbufs:
         rationale: postgres-decoderbufs extension
-        ref: stream-12-rhel-8.4.0
+        ref: stream-12-rhel-8.5.0
+        buildorder: 1
+      pg_repack:
+        rationale: pg_repack extension
+        ref: stream-12-rhel-8.5.0
         buildorder: 1
diff --git a/postgresql.yaml b/postgresql.yaml
deleted file mode 100644
index 6bc0135..0000000
--- a/postgresql.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-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.4.0]
-      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-server
-      client:
-        rpms:
-          - postgresql
-  components:
-    rpms:
-      postgresql:
-        rationale: Module API.
-        ref: 2d7894feea4a8df7ecf6203237293c0cffa35c31
-        buildorder: 0
-      pgaudit:
-        rationale: pgaudit extension
-        ref: 15e9e8ae61f8a95ee8b695c6271c7c8fb203d296
-        buildorder: 1
-      postgres-decoderbufs:
-        rationale: postgres-decoderbufs extension
-        ref: 70c8ed003a2ff03fd592a0149242350ab8dbb62b
-        buildorder: 1