diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 1ac9c3c..fd73d68 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,79 +1,89 @@
+---
 document: modulemd
 version: 2
 data:
-    name: php
-    stream: 7.3
-    summary: PHP scripting language
-    description: php 7.3 module
-    license:
-        module:
-            - GPLv2+
-        content:
-            - BSD
-            - PHP
-            - MIT
-            - Zend
-    dependencies:
-        - buildrequires:
-            platform: [el8]
-            httpd: [2.4]
-            nginx: [1.14]
-          requires:
-            platform: [el8]
-            nginx: []
-            httpd: [2.4]
-    references:
-        documentation: http://php.net/
-        tracker: https://bugs.php.net/
-    profiles:
-        common:
-            rpms:
-                - php-cli
-                - php-common
-                - php-fpm
-                - php-json
-                - php-mbstring
-                - php-xml
-        devel:
-            rpms:
-                - libzip
-                - php-cli
-                - php-common
-                - php-devel
-                - php-fpm
-                - php-json
-                - php-mbstring
-                - php-pear
-                - php-pecl-zip
-                - php-process
-                - php-xml
-        minimal:
-            rpms:
-                - php-cli
-                - php-common
-    api:
-        rpms:
-            - php-fpm
-    components:
-        rpms:
-            php:
-                rationale: Module API.
-                ref: stream-7.3-rhel-8.1.0
-                buildorder: 1
-            libzip:
-                rationale: ZIP library
-                ref: stream-php-7.3-rhel-8.1.0
-                buildorder: 1
-            php-pear:
-                rationale: Extension management
-                ref: stream-php-7.3-rhel-8.1.0
-                buildorder: 2
-            php-pecl-apcu:
-                rationale: APCu extension
-                ref: stream-php-7.3-rhel-8.1.0
-                buildorder: 3
-            php-pecl-zip:
-                rationale: ZIP extension
-                ref: stream-php-7.3-rhel-8.1.0
-                buildorder: 3
-
+  name: php
+  stream: 7.3
+  summary: PHP scripting language
+  description: >-
+    php 7.3 module
+  license:
+    module:
+    - GPLv2+
+    content:
+    - BSD
+    - MIT
+    - PHP
+    - Zend
+  dependencies:
+  - buildrequires:
+      httpd: [2.4]
+      nginx: [1.14]
+      platform: [el8]
+    requires:
+      httpd: [2.4]
+      nginx: []
+      platform: [el8]
+  references:
+    documentation: http://php.net/
+    tracker: https://bugs.php.net/
+  profiles:
+    common:
+      rpms:
+      - php-cli
+      - php-common
+      - php-fpm
+      - php-json
+      - php-mbstring
+      - php-xml
+    devel:
+      rpms:
+      - libzip
+      - php-cli
+      - php-common
+      - php-devel
+      - php-fpm
+      - php-json
+      - php-mbstring
+      - php-pear
+      - php-pecl-zip
+      - php-process
+      - php-xml
+    minimal:
+      rpms:
+      - php-cli
+      - php-common
+  api:
+    rpms:
+    - php-fpm
+  components:
+    rpms:
+      libzip:
+        rationale: ZIP library
+        ref: stream-php-7.3-rhel-8.2.0
+        buildorder: 1
+      php:
+        rationale: Module API.
+        ref: stream-7.3-rhel-8.2.0
+        buildorder: 1
+      php-pear:
+        rationale: Extension management
+        ref: stream-php-7.3-rhel-8.2.0
+        buildorder: 2
+      php-pecl-apcu:
+        rationale: APCu extension
+        ref: stream-php-7.3-rhel-8.2.0
+        buildorder: 3
+      php-pecl-rrd:
+        rationale: RRD extension
+        ref: stream-php-7.3-rhel-8.2.0
+        buildorder: 3
+      php-pecl-xdebug:
+        rationale: Xdebug extension
+        ref: stream-php-7.3-rhel-8.2.0
+        buildorder: 3
+      php-pecl-zip:
+        rationale: ZIP extension
+        ref: stream-php-7.3-rhel-8.2.0
+        buildorder: 3
+...
diff --git a/php.yaml b/php.yaml
deleted file mode 100644
index a5431e5..0000000
--- a/php.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: php
-  stream: 7.3
-  summary: PHP scripting language
-  description: >-
-    php 7.3 module
-  license:
-    module:
-    - GPLv2+
-    content:
-    - BSD
-    - MIT
-    - PHP
-    - Zend
-  dependencies:
-  - buildrequires:
-      httpd: [2.4]
-      nginx: [1.14]
-      platform: [el8.1.0]
-    requires:
-      httpd: [2.4]
-      nginx: []
-      platform: [el8]
-  references:
-    documentation: http://php.net/
-    tracker: https://bugs.php.net/
-  profiles:
-    common:
-      rpms:
-      - php-cli
-      - php-common
-      - php-fpm
-      - php-json
-      - php-mbstring
-      - php-xml
-    devel:
-      rpms:
-      - libzip
-      - php-cli
-      - php-common
-      - php-devel
-      - php-fpm
-      - php-json
-      - php-mbstring
-      - php-pear
-      - php-pecl-zip
-      - php-process
-      - php-xml
-    minimal:
-      rpms:
-      - php-cli
-      - php-common
-  api:
-    rpms:
-    - php-fpm
-  components:
-    rpms:
-      libzip:
-        rationale: ZIP library
-        ref: fe41880e6316b5c96243d1eb28dc9072c92b4e14
-        buildorder: 1
-      php:
-        rationale: Module API.
-        ref: 6cb53d10e321b44a8043ae1d6c5ca04dee05ce14
-        buildorder: 1
-      php-pear:
-        rationale: Extension management
-        ref: 4c171b02975cc443bf43375bab5d2bc74b3af74c
-        buildorder: 2
-      php-pecl-apcu:
-        rationale: APCu extension
-        ref: 025f9e66479957e2f770b45587fd959ca19e6727
-        buildorder: 3
-      php-pecl-zip:
-        rationale: ZIP extension
-        ref: acf725f396086756a26971325c4fd13c7e50b73d
-        buildorder: 3
-...
-